diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index 7bd2bf1b..3760f7a9 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -133,7 +133,7 @@ class BaseApplication(object): # ------ BaseApplication methods ------------------------------- def __init__(self, option_parser=None): - self.logger = getLogger(self.APPNAME + u"-" + self.VERSION) + self.logger = getLogger(self.APPNAME) self.weboob = self.create_weboob() if self.CONFDIR is None: self.CONFDIR = self.weboob.workdir @@ -372,7 +372,8 @@ class BaseApplication(object): @classmethod def create_default_logger(klass): # stdout logger - format = '%(asctime)s:%(levelname)s:%(name)s:%(filename)s:%(lineno)d:%(funcName)s %(message)s' + format = '%(asctime)s:%(levelname)s:%(name)s:' + klass.VERSION +\ + ':%(filename)s:%(lineno)d:%(funcName)s %(message)s' handler = logging.StreamHandler(sys.stdout) handler.setFormatter(createColoredFormatter(sys.stdout, format)) return handler @@ -392,7 +393,8 @@ class BaseApplication(object): self.logger.error('Unable to create the logging file: %s' % e) sys.exit(1) else: - format = '%(asctime)s:%(levelname)s:%(name)s:%(pathname)s:%(lineno)d:%(funcName)s %(message)s' + format = '%(asctime)s:%(levelname)s:%(name)s:' + self.VERSION +\ + ':%(filename)s:%(lineno)d:%(funcName)s %(message)s' handler = logging.StreamHandler(stream) handler.setFormatter(logging.Formatter(format)) return handler diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 4d477da8..7e4fe84d 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -264,7 +264,7 @@ class BaseBackend(object): return u"" % self.name def __init__(self, weboob, name, config=None, storage=None, logger=None): - self.logger = getLogger(name + u"-" + self.VERSION, parent=logger) + self.logger = getLogger(name, parent=logger) self.weboob = weboob self.name = name self.lock = RLock()