2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Updated log path options

Browse source 
* Adjusted default log path
* Support Windows Kit/Tool/General log paths
This commit is contained in:
2Shirt 2019-10-02 21:34:07 -07:00
parent 1ffabd8642
commit ad06fab8a2
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/wk/log.py
View file

@ -17,14 +17,12 @@ if os.name == 'nt':
DEFAULT_LOG_DIR = ( DEFAULT_LOG_DIR = (
f'{os.environ.get("SYSTEMDRIVE", "C:")}/' f'{os.environ.get("SYSTEMDRIVE", "C:")}/'
f'{cfg.main.KIT_NAME_SHORT}/' f'{cfg.main.KIT_NAME_SHORT}/'
f'{time.strftime("%Y-%m-%d")}/' f'{time.strftime("%Y-%m-%d")}'
f'{cfg.main.KIT_NAME_FULL}'
) )
DEFAULT_LOG_NAME = ''
else: else:
# Example: "/home/tech/Logs" # Example: "/home/tech/Logs"
DEFAULT_LOG_DIR = f'{os.path.expanduser("~")}/Logs' DEFAULT_LOG_DIR = f'{os.path.expanduser("~")}/Logs'
DEFAULT_LOG_NAME = cfg.main.KIT_NAME_FULL DEFAULT_LOG_NAME = cfg.main.KIT_NAME_FULL
# Functions # Functions
@ -40,10 +38,13 @@ def enable_debug_mode():
root_logger.setLevel('DEBUG') root_logger.setLevel('DEBUG')
def format_log_path(log_dir=None, log_name=None, tool=False, timestamp=True): def format_log_path(
log_dir=None, log_name=None, timestamp=False,
kit=False, tool=False):
"""Format path based on args passed, returns pathlib.Path obj.""" """Format path based on args passed, returns pathlib.Path obj."""
log_path = pathlib.Path( log_path = pathlib.Path(
f'{log_dir if log_dir else DEFAULT_LOG_DIR}/' f'{log_dir if log_dir else DEFAULT_LOG_DIR}/'
f'{cfg.main.KIT_NAME_FULL+"/" if kit else ""}'
f'{"Tools/" if tool else ""}' f'{"Tools/" if tool else ""}'
f'{log_name if log_name else DEFAULT_LOG_NAME}' f'{log_name if log_name else DEFAULT_LOG_NAME}'
f'{"_" if timestamp else ""}' f'{"_" if timestamp else ""}'
@ -76,7 +77,7 @@ def get_root_logger_path():
def start(config=None): def start(config=None):
"""Configure and start logging using safe defaults.""" """Configure and start logging using safe defaults."""
log_path = format_log_path() log_path = format_log_path(timestamp=os.name != 'nt')
root_logger = logging.getLogger() root_logger = logging.getLogger()
# Safety checks # Safety checks