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>
(cherry picked from commit 6cfb4b35ea13f7953d25bf0d2baae75bfe3fb5d0)

diff --git a/src/ceph-disk b/src/ceph-disk
index 8285509fc42d41d99d799e340cab7a0a0ef3569e..c5970332c7d1c8e49f9b8cd2de98ae7acc5c1062 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -2911,6 +2911,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',
@@ -3140,9 +3145,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)