Nettoyage des conflits dans Monitor.py et mise à jour du requirements.txt
This commit is contained in:
13
Monitor.py
13
Monitor.py
@@ -1,4 +1,3 @@
|
||||
# Surveillance continue avec envoi d'alertes par email + rappels + log CSV
|
||||
import mysql.connector
|
||||
from datetime import datetime, timedelta
|
||||
import time
|
||||
@@ -18,11 +17,9 @@ config = {
|
||||
"database": os.getenv("DB_NAME")
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Charger les destinataires depuis .env
|
||||
=======
|
||||
# Charger les destinataires depuis .env
|
||||
>>>>>>> product
|
||||
|
||||
destinataires = os.getenv("DESTINATAIRES_MAIL", "").split(',')
|
||||
|
||||
# --- Suivi des alertes actives pour rappels ---
|
||||
@@ -36,15 +33,14 @@ def envoyer_mail(sujet, message, destinataires_list):
|
||||
msg['To'] = ', '.join(destinataires_list)
|
||||
try:
|
||||
with smtplib.SMTP_SSL('smtp.mail.ovh.net', 465) as server:
|
||||
<<<<<<< HEAD
|
||||
|
||||
server.login('alertes_saclay@domo91.fr', 'Kdpke674y23Feq^H')
|
||||
server.sendmail(msg['From'], destinataires_list, msg.as_string())
|
||||
print(f"📧 Mail envoyé à {destinataires_list}", flush=True)
|
||||
=======
|
||||
server.login('alertes_saclay@domo91.fr','Kdpke674y23Feq^H')
|
||||
server.sendmail(msg['From'], destinataires, msg.as_string())
|
||||
print(f"📧 Mail envoyé à {destinataires}", flush=True)
|
||||
>>>>>>> product
|
||||
|
||||
except Exception as e:
|
||||
print(f"Erreur envoi mail : {e}", flush=True)
|
||||
|
||||
@@ -151,11 +147,8 @@ def surveiller():
|
||||
|
||||
if log_entries:
|
||||
df_logs = pd.DataFrame(log_entries)
|
||||
<<<<<<< HEAD
|
||||
df_logs.to_csv("/var/log/monitor.csv", sep=";", index=False)
|
||||
=======
|
||||
df_logs.to_csv("/home/debian/Gestion_sondes/Logs/monitor.csv", sep=";", index=False)
|
||||
>>>>>>> product
|
||||
|
||||
except Exception as e:
|
||||
print(f"Erreur : {e}", flush=True)
|
||||
|
||||
Reference in New Issue
Block a user