Kaynağa Gözat

CHG les mails de logs portent des noms plus explicites

olivier.massot 7 yıl önce
ebeveyn
işleme
faa45e3059
3 değiştirilmiş dosya ile 14 ekleme ve 6 silme
  1. 4 0
      core/logconf.py
  2. 6 2
      logging.yaml
  3. 4 4
      resources/qgis_migration_postgis.py

+ 4 - 0
core/logconf.py

@@ -27,6 +27,10 @@ def start(name="main", level=0, filename=""):
         filename = DEFAULT_LOG_DIR / r'{}_{:%Y%m%d_%H%M}.log'.format(name, datetime.now())
     conf["handlers"]["file"]["filename"] = filename
 
+
+    conf["handlers"]["mail"]["fromaddr"] = conf["handlers"]["mail"]["fromaddr"].replace("%name%", name)
+    conf["handlers"]["mail"]["subject"] = conf["handlers"]["mail"]["subject"].replace("%name%", name)
+
     logging.config.dictConfig(conf)
 
     logger = logging.getLogger(name)

+ 6 - 2
logging.yaml

@@ -29,12 +29,16 @@ handlers:
         level: INFO
         formatter: complete
         mailhost: smtp.bas-rhin.fr
-        fromaddr: log@bas-rhin.fr
+        fromaddr: log.%name%@bas-rhin.fr
         toaddrs: [olivier.massot@bas-rhin.fr, jacky.klein@bas-rhin.fr]
-        subject: log
+        subject: Rapport d'exécution de %name%
         capacity: 100000000
         
 loggers:
+    test:
+        level: DEBUG
+        handlers: [console, file, mail]
+        propagate: no    
     gf2analytique:
         level: DEBUG
         handlers: [console, file, mail]

+ 4 - 4
qgis_migration_postgis.py → resources/qgis_migration_postgis.py

@@ -32,10 +32,10 @@ csig_db.execute("DELETE FROM t_troncons")
 csig_db.execute("DELETE FROM t_regards")
 csig_db.execute("DELETE FROM t_chantiers")
 
-csig_db.execute("SELECT setval('t_points_compactage_id_seq', (SELECT MAX(id) FROM t_points_compactage) + 1)")
-csig_db.execute("SELECT setval('t_regards_id_seq', (SELECT MAX(id) FROM t_regards) + 1)")
-csig_db.execute("SELECT setval('t_troncons_id_seq', (SELECT MAX(id) FROM t_troncons) + 1)")
-csig_db.execute("SELECT setval('t_chantiers_id_seq', (SELECT MAX(id) FROM t_chantiers) + 1)")
+csig_db.execute("SELECT setval('t_points_compactage_id_seq', 1)")
+csig_db.execute("SELECT setval('t_regards_id_seq', 1)")
+csig_db.execute("SELECT setval('t_troncons_id_seq', 1)")
+csig_db.execute("SELECT setval('t_chantiers_id_seq', 1)")
 
 csig_db.commit()
 logger.info("* tables reinitialisees")