Add MemoryHandler to logger and flush it to created logfile

cinek810 · Jun 21, 2022 · 0d3fefc · 0d3fefc
1 parent b0e1548
commit 0d3fefc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/source/main.py b/source/main.py
@@ -106,8 +106,17 @@ def main():
     config = configuration.load_configuration()
 
     if options["subcommand"] in ("run", "verify"):
-        workdir = misc.create_workdir(start_ts, conf, logger.logger)
-        Loggers.set_logging_to_file(logger, workdir, start_ts, conf)
+        workdir = misc.create_workdir(start_ts, configuration.conf, logger.logger)
+        Loggers.set_logging_to_file(logger, workdir, start_ts, configuration.conf)
+        if options["syslog"]:
+            # handler[1] - MemoryHandler, handler[3] - FileHandler
+            logger.logger.handlers[1].setTarget(logger.logger.handlers[3])
+        else:
+            # handler[0] - MemoryHandler, handler[2] - FileHandler
+            logger.logger.handlers[0].setTarget(logger.logger.handlers[2])
+        logger.logger.handlers[0].flush()
+    else:
+        logger.logger.handlers[0].close()
 
     validators = Validators(logger.logger)
     validators.validate_options(options)

diff --git a/source/modules/outputs/logging.py b/source/modules/outputs/logging.py
@@ -25,6 +25,11 @@ def set_logging(options: dict):
             rsys_handler.setLevel(logging.WARNING)
             logger.addHandler(rsys_handler)
 
+        memory_handler = log_han.MemoryHandler(15, flushLevel=logging.DEBUG, flushOnClose=False)
+        memory_handler.setFormatter(formatter)
+        memory_handler.setLevel(logging.DEBUG)
+        logger.addHandler(memory_handler)
+
         console_handler = logging.StreamHandler()
         console_handler.setFormatter(console_formatter)
         console_handler.setLevel(logging.DEBUG if options["debug"] else logging.INFO)