From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Jul 2021 05:15:06 +0000 (+0800)
Subject: qa/tasks/vstart_runner: consolidate logging message in LocalDaemon
X-Git-Tag: v17.1.0~1185^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e15ceb6bae89fbb2289469cf307414980b60f8e8;p=ceph.git

qa/tasks/vstart_runner: consolidate logging message in LocalDaemon

it's more readable if we have a single logging message when no matching
pid is found.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index b205d1f203f2..2b4700ccf868 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -532,13 +532,11 @@ class LocalDaemon(object):
             if line.find("ceph-{0} -i {1}".format(self.daemon_type, self.daemon_id)) != -1:
                 log.debug("Found ps line for daemon: {0}".format(line))
                 return int(line.split()[0])
-        if opt_log_ps_output:
-            log.debug("No match for {0} {1}: {2}".format(
-                self.daemon_type, self.daemon_id, ps_txt))
-        else:
-            log.debug("No match for {0} {1}".format(self.daemon_type,
-                     self.daemon_id))
-            return None
+        if not opt_log_ps_output:
+            ps_txt = '(omitted)'
+        log.debug("No match for {0} {1}: {2}".format(
+            self.daemon_type, self.daemon_id, ps_txt))
+        return None
 
     def wait(self, timeout):
         waited = 0