From 3e0ba27856e9b5fea031c5a868b4000e1db21064 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 23 Aug 2019 13:58:44 +1000 Subject: [PATCH] base: set up the loggers a bit more sensibly Both handlers need to be set up to log at debug level, the logger itself will filter correctly anyway where verbose isn't given. And we want them both to log in the same format, so let's re-use the formatter. Signed-off-by: Peter Hutterer --- tuhi/base.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tuhi/base.py b/tuhi/base.py index 22eb914..a18d4db 100644 --- a/tuhi/base.py +++ b/tuhi/base.py @@ -35,9 +35,6 @@ from tuhi.config import TuhiConfig DEFAULT_CONFIG_PATH = Path(xdg.BaseDirectory.xdg_data_home, 'tuhi') -logging.basicConfig(format='%(asctime)s %(levelname)s: %(name)s: %(message)s', - level=logging.INFO, - datefmt='%H:%M:%S') logger = logging.getLogger('tuhi') WACOM_COMPANY_IDS = [0x4755, 0x4157] @@ -426,11 +423,17 @@ class Tuhi(GObject.Object): def setup_logging(config_dir): session_log_file = Path(config_dir, 'session-logs', f'tuhi-{time.strftime("%y-%m-%d-%H:%M:%S")}.log') session_log_file.parent.mkdir(parents=True, exist_ok=True) + + formatter = logging.Formatter(fmt='%(asctime)s %(levelname)s: %(name)s: %(message)s', + datefmt='%H:%M:%S') + fh = logging.FileHandler(session_log_file) fh.setLevel(logging.DEBUG) + fh.setFormatter(formatter) ch = logging.StreamHandler() - ch.setLevel(logging.ERROR) + ch.setLevel(logging.DEBUG) + ch.setFormatter(formatter) logger.addHandler(ch) logger.addHandler(fh) logger.info(f'Session log: {session_log_file}') @@ -462,6 +465,8 @@ def main(args=sys.argv): if ns.verbose: logger.setLevel(logging.DEBUG) + else: + logger.setLevel(logging.INFO) try: mainloop = GLib.MainLoop()