diff --git a/kibot/bom/xlsx_writer.py b/kibot/bom/xlsx_writer.py index b77fd7d0..bd731b6f 100644 --- a/kibot/bom/xlsx_writer.py +++ b/kibot/bom/xlsx_writer.py @@ -574,7 +574,8 @@ def _create_kicost_sheet(workbook, groups, image_data, fmt_title, fmt_info, fmt_ for c in g.components: logger.debug(pprint.pformat(c.__dict__)) # Force KiCost to use our logger - init_all_loggers(log.get_logger('kicost'), log.get_logger('kicost.dist'), log.get_logger('kicost.eda')) + init_all_loggers(log.get_logger('kicost', indent=1), log.get_logger('kicost.dist', indent=1), + log.get_logger('kicost.eda', indent=1)) set_distributors_progress(ProgressConsole2) if GS.debug_enabled: logger.setLevel(logging.DEBUG+1-GS.debug_level) diff --git a/kibot/log.py b/kibot/log.py index 50726cee..591f6d73 100644 --- a/kibot/log.py +++ b/kibot/log.py @@ -32,7 +32,7 @@ visual_level = None debug_level = 0 -def get_logger(name=None): +def get_logger(name=None, indent=None): """Get a module for a submodule or the root logger if no name is provided""" # print('get_logger '+str(name)) @@ -41,9 +41,13 @@ def get_logger(name=None): init() if name: if name.startswith(domain): - return logging.getLogger(name) - return logging.getLogger(domain+'.'+name) - return logging.getLogger(domain) + lg = logging.getLogger(name) + else: + lg = logging.getLogger(domain+'.'+name) + else: + lg = logging.getLogger(domain) + lg.indent = indent + return lg def set_domain(name): @@ -113,6 +117,13 @@ class MyLogger(logging.Logger): else: super(self.__class__, self).debug(msg, *args, **kwargs) + def info(self, msg, *args, **kwargs): + if isinstance(msg, tuple): + msg = ' '.join(map(str, msg)) + if self.indent: + msg = ' '*self.indent+msg + super(self.__class__, self).info(msg, *args, **kwargs) + def debugl(self, level, msg, *args, **kwargs): # Similar to log() but using the debug_level (-vvvv) instead of the Python level global debug_level