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 18abad40850e0c6f4f2d14314b7537b9d8fa951e..104d4bc28465ced86e8af2a16e5ae0b671a3a6c3 100755 (executable)
--- 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,