From 107b936c93dcb380badb057a020acec6c648a41b Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Wed, 23 Jun 2021 17:47:59 +0530 Subject: [PATCH] vstart_runner: maintain log level when --debug is passed When --debug and --clear-old-log options are passed to vstart_runner.py, it ends up resetting log level to the default level (which is logging.INFO) despite of --debug. Set "log_level" as default parameter to init_log() so that the log level code for clearing old log can pass current logging level to init_log() to maintain the log level user desired for. Fixes: https://tracker.ceph.com/issues/51344 Signed-off-by: Rishabh Dave (cherry picked from commit 73567a14472d27b3e3f7e774065137c17e67102e) --- qa/tasks/vstart_runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index c88c93b80ec01..a03d25ae203d4 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -63,7 +63,7 @@ except: pass -def init_log(): +def init_log(log_level=logging.INFO): global log if log is not None: del log @@ -78,7 +78,7 @@ def init_log(): datefmt='%Y-%m-%dT%H:%M:%S') handler.setFormatter(formatter) log.addHandler(handler) - log.setLevel(logging.INFO) + log.setLevel(log_level) log = None init_log() @@ -1344,7 +1344,7 @@ def clear_old_log(): os.remove(logpath) with open(logpath, 'w') as logfile: logfile.write('') - init_log() + init_log(log.level) log.debug('logging in a fresh file now...')