Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lnst/Common/Logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class LoggingCtl:
agents = {}
transmit_handler = None
_id_seq = 0
log_list = {}
log_list = None

def __init__(self, debug=False, log_dir=None, log_subdir="", colours=True):
#clear any previously set handlers
Expand Down Expand Up @@ -130,11 +130,6 @@ def __init__(self, debug=False, log_dir=None, log_subdir="", colours=True):
self.display_handler = logging.StreamHandler(sys.stdout)
self.display_handler.setFormatter(MultilineFormatter(colours))

# the export_handler will add log messages to lists, so it could be exported to .lrc file
self.log_list["controller"] = []
self.export_handler = self._create_export_handler(self.log_list["controller"], colours)
self.export_handler.setLevel(logging.DEBUG)

if not debug:
self.display_handler.setLevel(logging.INFO)
else:
Expand All @@ -146,7 +141,6 @@ def __init__(self, debug=False, log_dir=None, log_subdir="", colours=True):
logger = logging.getLogger()
logger.setLevel(logging.NOTSET)
logger.addHandler(self.display_handler)
logger.addHandler(self.export_handler)

def unset_formatter(self):
self.display_handler.setFormatter(None)
Expand Down Expand Up @@ -182,11 +176,21 @@ def set_recipe(self, recipe_path, clean=True, prepend=False, expand=""):
logger.addHandler(recipe_info)
logger.addHandler(recipe_debug)

# set the export_handler
self.log_list = {}
self.log_list["controller"] = []
self.export_handler = self._create_export_handler(self.log_list["controller"])
self.export_handler.setLevel(logging.DEBUG)
logger.addHandler(self.export_handler)

def unset_recipe(self):
logger = logging.getLogger()
logger.removeHandler(self.recipe_handlers[0])
logger.removeHandler(self.recipe_handlers[1])
self.recipe_handlers = (None, None)
logger.removeHandler(self.export_handler)
self.export_handler = None
self.log_list = None

def add_agent(self, agent_id):
agent_log_path = os.path.join(self.recipe_log_path, agent_id)
Expand Down
1 change: 1 addition & 0 deletions lnst/Controller/Controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ def run(self, recipe, **kwargs):
raise
finally:
self._cleanup_agents()
self._log_ctl.unset_recipe()
Comment thread
olichtne marked this conversation as resolved.
finally:
if isinstance(self._pools, ContainerPoolManager):
self._pools.cleanup()
Expand Down
Loading