From 8b4daa507bea50cf2415bda782881c937216975e Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 13 Jul 2019 17:23:35 -0600 Subject: [PATCH] Use different default log_path under Windows --- scripts/wk/log.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/wk/log.py b/scripts/wk/log.py index 571c9a77..63947635 100644 --- a/scripts/wk/log.py +++ b/scripts/wk/log.py @@ -61,12 +61,21 @@ def update_log_path(dest_dir, dest_filename=''): def start(config=None): """Configure and start logging using safe defaults.""" - log_dir = '{}/Logs/'.format(os.path.expanduser('~')) - log_path = '{}/{}_{}.log'.format( - log_dir, - cfg.main.KIT_NAME_FULL, - time.strftime('%Y-%m-%d_%H%M%S%z'), - ) + if os.name == 'nt': + log_path = '{drive}/{short}/Logs/{date}/{full}/log_{datetime}.log'.format( + drive=os.environ.get('SYSTEMDRIVE', 'C:'), + short=cfg.main.KIT_NAME_SHORT, + date=time.strftime('%y-%m-%d'), + full=cfg.main.KIT_NAME_FULL, + datetime=time.strftime('%Y-%m-%d_%H%M%S%z'), + ) + else: + log_path = '{home}/Logs/{full}_{datetime}.log'.format( + home=os.path.expanduser('~'), + full=cfg.main.KIT_NAME_FULL, + datetime=time.strftime('%Y-%m-%d_%H%M%S%z'), + ) + log_path = pathlib.Path(log_path).resolve() root_logger = logging.getLogger() # Safety checks @@ -76,7 +85,7 @@ def start(config=None): raise UserWarning('Logging already started.') # Create log_dir - os.makedirs(log_dir, exist_ok=True) + os.makedirs(log_path.parent, exist_ok=True) # Config logger logging.basicConfig(filename=log_path, **config)