feat: cleanup and format logs

app/WYGIWYH/logs/ProcrastinateFilter.py

@@ -0,0 +1,19 @@
+import logging
+
+
+class ProcrastinateFilter(logging.Filter):
+    # from https://github.com/madzak/python-json-logger/blob/master/src/pythonjsonlogger/jsonlogger.py#L19
+    _reserved_log_keys = frozenset(
+        """args asctime created exc_info exc_text filename
+        funcName levelname levelno lineno module msecs message msg name pathname
+        process processName relativeCreated stack_info thread threadName""".split()
+    )
+
+    def filter(self, record: logging.LogRecord):
+        record.procrastinate = {}
+        for key, value in vars(record).items():
+            if not key.startswith("_") and key not in self._reserved_log_keys | {
+                "procrastinate"
+            }:
+                record.procrastinate[key] = value  # type: ignore
+        return True

app/WYGIWYH/settings.py

@@ -278,28 +278,42 @@ if "procrastinate" in sys.argv:
         "disable_existing_loggers": False,
         "formatters": {
             "procrastinate": {
-                "format": "%(asctime)s %(levelname)-7s %(name)s %(message)s"
+                "format": "[%(asctime)s] - %(levelname)s - %(name)s - %(message)s -> %(procrastinate)s",
+                "datefmt": "%Y-%m-%d %H:%M:%S",
+            },
+            "standard": {
+                "format": "[%(asctime)s] - %(levelname)s - %(name)s - %(message)s",
+                "datefmt": "%Y-%m-%d %H:%M:%S",
+            },
+        },
+        "filters": {
+            "procrastinate": {
+                "()": "WYGIWYH.logs.ProcrastinateFilter.ProcrastinateFilter",
+                "name": "procrastinate",
             },
         },
         "handlers": {
             "procrastinate": {
-                "level": "DEBUG",
+                "level": "INFO",
                 "class": "logging.StreamHandler",
                 "formatter": "procrastinate",
+                "filters": ["procrastinate"],
             },
             "console": {
                 "class": "logging.StreamHandler",
+                "formatter": "standard",
+                "level": "INFO",
             },
         },
         "loggers": {
             "procrastinate": {
                 "handlers": ["procrastinate"],
-                "level": "INFO",
-                "propagate": False,
+                "propagate": True,
             },
             "root": {
-                "handlers": ["console"],
+                "handlers": None,
                 "level": "INFO",
+                "propagate": False,
             },
         },
     }
@@ -308,24 +322,25 @@ else:
         "version": 1,
         "disable_existing_loggers": False,
         "formatters": {
-            "procrastinate": {
-                "format": "%(asctime)s %(levelname)-7s %(name)s %(message)s"
+            "standard": {
+                "format": "[%(asctime)s] - %(levelname)s - %(name)s - %(message)s",
+                "datefmt": "%Y-%m-%d %H:%M:%S",
             },
         },
         "handlers": {
-            "procrastinate": {
-                "level": "DEBUG",
-                "class": "logging.StreamHandler",
-                "formatter": "procrastinate",
-            },
             "console": {
                 "class": "logging.StreamHandler",
+                "formatter": "standard",
+                "level": "INFO",
+            },
+            "procrastinate": {
+                "level": "INFO",
+                "class": "logging.StreamHandler",
             },
         },
         "loggers": {
             "procrastinate": {
                 "handlers": None,
-                "level": "INFO",
                 "propagate": False,
             },
             "root": {