From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 27 Aug 2015 10:43:58 +0000 (+0200)
Subject: ceph-disk: cosmetic: setup_logging function
X-Git-Tag: v9.1.0~252^2~1^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60c22a9353c0c4245ccda1dbd3416956ac713a3d;p=ceph.git

ceph-disk: cosmetic: setup_logging function

Split the main function to extract the verbose handling part into the
setup_logging function.

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

diff --git a/src/ceph-disk b/src/ceph-disk
index e2c5b4430740..81f0cf30a805 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -3192,18 +3192,7 @@ def make_zap_parser(subparsers):
 def main(argv):
     args = parse_args(argv)
 
-    loglevel = logging.WARNING
-    if args.verbose:
-        loglevel = logging.DEBUG
-
-    if args.log_stdout:
-        ch = logging.StreamHandler(stream=sys.stdout)
-        ch.setLevel(loglevel)
-        LOG.addHandler(ch)
-    else:
-        logging.basicConfig(
-            level=loglevel,
-            )
+    setup_logging(args.verbose, args.log_stdout)
 
     if args.prepend_to_path != '':
         path = os.environ.get('PATH', os.defpath)
@@ -3217,6 +3206,20 @@ def main(argv):
     else:
         main_catch(args.func, args)
 
+def setup_logging(verbose, log_stdout):
+    loglevel = logging.WARNING
+    if verbose:
+        loglevel = logging.DEBUG
+
+    if log_stdout:
+        ch = logging.StreamHandler(stream=sys.stdout)
+        ch.setLevel(loglevel)
+        LOG.addHandler(ch)
+    else:
+        logging.basicConfig(
+            level=loglevel,
+            )
+
 def main_catch(func, args):
 
     try: