Fehler mit einzelner spitzer Klammer

fehlerbericht/config.py

@@ -1,7 +1,7 @@
 # DSN = "mysql+pymysql://gaps:Gcbs12ma@192.168.2.41/tasks"
 # DSN = "mysql+pymysql://gaps:Gcbs12ma@localhost/tasks"
 DSN = "mysql+pymysql://gaps:Gcbs12ma@192.168.4.62/tasks"
-MAILBOX = {
+MAILBOX2 = {
     "server": "imap.1und1.de",
     "user": "status@global-cube.de",
     "password": "(6QNLU=7m3R?f2?6]JO4WH(K",
@@ -14,3 +14,4 @@ MAILBOX = {
     "password": "VtAgcw&(L6Sa%R<L",
     "folder": "INBOX",
 }
+DEBUG = False

fehlerbericht/prepare_logfiles.py

@@ -1,21 +1,24 @@
 import re
-from config import DSN
+from config import DSN, DEBUG
 from model import StatusMeldung
 from logfiles.systeminfo_log import SysteminfoLog
-
 import json
 import os
 from sqlalchemy import create_engine, select
 from sqlalchemy.orm import Session
-
-# from datetime import date, timedelta
+from datetime import date, timedelta
 
 
 class PrepareLogfiles:
     def prepare_logfiles(self):
         with Session(create_engine(DSN)) as db_session:
-            query = select(StatusMeldung).where(StatusMeldung.fehlerbericht.is_(None))
-            # .where(StatusMeldung.datum.between(date.today() - timedelta(days=3), date.today()))
+            if DEBUG:
+                query = select(StatusMeldung).where(
+                    StatusMeldung.datum.between(date.today() - timedelta(days=3), date.today())
+                )
+            else:
+                query = select(StatusMeldung).where(StatusMeldung.fehlerbericht.is_(None))
+
             for sm in db_session.scalars(query):
                 self.convert_logfile(sm)
                 db_session.commit()
@@ -45,7 +48,7 @@ class PrepareLogfiles:
                     e,
                 )
 
-                e, _ = re.subn(
+                e = re.sub(
                     r"Error \= \[Micro.* NULL.*\.",
                     "",
                     e,
@@ -63,6 +66,10 @@ class PrepareLogfiles:
                 e, err_count[5] = re.subn(r"(Traceback)", r"<b>\1</b>", e)
                 e, err_count[6] = re.subn(r"(Fatal error: Uncaught exception)", r"<b>\1</b>", e)
                 e, err_count[7] = re.subn(r"(Failed to create COM object)", r"<b>\1</b>", e)
+                e = re.sub(r"<([^a-z/])", r"\1", e)
+                e = re.sub(r"/\s+>", "/>", e)
+                e = re.sub(r"([^a-z/])>", r"\1", e)
+                report["Errors"][0] = e
 
                 if sum(err_count) > 0:
                     report["ErrorLevel"] = 2