Skip to content

Commit

Permalink
fix double lines in log file
Browse files Browse the repository at this point in the history
add flush_memory_handler() function in modules.misc
bugfix 0d3fefc
  • Loading branch information
LegenJCdary committed Sep 21, 2022
1 parent d433ddd commit 012a126
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
8 changes: 1 addition & 7 deletions source/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,7 @@ def main():
if options["subcommand"] in ("run", "verify"):
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()
misc.flush_memory_handler(options["syslog"], logger)
else:
logger.logger.handlers[0].close()

Expand Down
13 changes: 13 additions & 0 deletions source/modules/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,16 @@ def format_show_deployer(print_data: dict):
content = f"{content}\n\nAvailable {key}:\n{values}\n"

return content

def flush_memory_handler(syslog: bool, logger):
"""Flush initial log messages from memory handler to logfile"""
if syslog:
# handler[1] - MemoryHandler, handler[3] - FileHandler
logger.logger.handlers[1].setTarget(logger.logger.handlers[3])
logger.logger.handlers[1].flush()
logger.logger.handlers[1].close()
else:
# handler[0] - MemoryHandler, handler[2] - FileHandler
logger.logger.handlers[0].setTarget(logger.logger.handlers[2])
logger.logger.handlers[0].flush()
logger.logger.handlers[0].close()

0 comments on commit 012a126

Please sign in to comment.