From: David Disseldorp <ddiss@suse.de>
Date: Tue, 12 May 2015 12:08:16 +0000 (+0200)
Subject: ceph-disk: add --log-stdout parameter
X-Git-Tag: v9.1.0~439^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6cfb4b35ea13f7953d25bf0d2baae75bfe3fb5d0;p=ceph.git

ceph-disk: add --log-stdout parameter

This can be used when ceph-disk is run by systemd services, to ensure
that output is captured in the journal.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 1d90f024f9f7..36cb2b7b4a57 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -2776,6 +2776,11 @@ def parse_args():
         action='store_true', default=None,
         help='be more verbose',
         )
+    parser.add_argument(
+        '--log-stdout',
+        action='store_true', default=None,
+        help='log to stdout',
+        )
     parser.add_argument(
         '--prepend-to-path',
         metavar='PATH',
@@ -3010,9 +3015,14 @@ def main():
     if args.verbose:
         loglevel = logging.DEBUG
 
-    logging.basicConfig(
-        level=loglevel,
-        )
+    if args.log_stdout:
+        ch = logging.StreamHandler(stream=sys.stdout)
+        ch.setLevel(loglevel)
+        LOG.addHandler(ch)
+    else:
+        logging.basicConfig(
+            level=loglevel,
+            )
 
     if args.prepend_to_path != '':
         path = os.environ.get('PATH', os.defpath)