]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: cosmetic: setup_logging function
authorLoic Dachary <ldachary@redhat.com>
Thu, 27 Aug 2015 10:43:58 +0000 (12:43 +0200)
committerLoic Dachary <ldachary@redhat.com>
Sat, 29 Aug 2015 00:37:52 +0000 (02:37 +0200)
Split the main function to extract the verbose handling part into the
setup_logging function.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/ceph-disk

index e2c5b4430740cdb3cd004c8f14b8dff7c4186a29..81f0cf30a805a26025ac69500b132d2757295db2 100755 (executable)
@@ -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: