]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart_runner: maintain log level when --debug is passed 42030/head
authorRishabh Dave <ridave@redhat.com>
Wed, 23 Jun 2021 12:17:59 +0000 (17:47 +0530)
committerRishabh Dave <ridave@redhat.com>
Thu, 24 Jun 2021 12:37:49 +0000 (18:07 +0530)
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 <ridave@redhat.com>
qa/tasks/vstart_runner.py

index a76601a24dfdbc23beb231f4cbe4087034bc2ed0..42a8d2319aaa67cb42cab599cacc4f73b775b785 100644 (file)
@@ -64,7 +64,7 @@ try:
 except:
     pass
 
-def init_log():
+def init_log(log_level=logging.INFO):
     global log
     if log is not None:
         del log
@@ -79,7 +79,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()
@@ -1123,7 +1123,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...')