From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 20 Sep 2015 12:23:47 +0000 (+0200)
Subject: ceph-disk: support --verbose with --log-stdout
X-Git-Tag: v9.1.0~89^2^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5aeca731aa5bfd0c2071c30e8287f73e34919c21;p=ceph.git

ceph-disk: support --verbose with --log-stdout

Set the LOG level as well as the channel level, otherwise the debug
messages are trimmed before they reach the channel. Also set the prefix
while we're at it.

http://tracker.ceph.com/issues/13180 Fixes: #13180

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 18abad40850e..104d4bc28465 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -3547,7 +3547,10 @@ def setup_logging(verbose, log_stdout):
     if log_stdout:
         ch = logging.StreamHandler(stream=sys.stdout)
         ch.setLevel(loglevel)
+        formatter = logging.Formatter('%(filename): %(message)s')
+        ch.setFormatter(formatter)
         LOG.addHandler(ch)
+        LOG.setLevel(loglevel)
     else:
         logging.basicConfig(
             level=loglevel,