Merge "CLI always configures logging"

2014-04-17 06:27:32 +00:00
parent db8da0de2e 59daf4bf02
commit bc1677ea1f
1 changed files with 5 additions and 1 deletions
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -383,7 +383,11 @@ class OpenStackIdentityShell(object):
            return 0

        if args.debug:
-            logging.basicConfig(level=logging.DEBUG)
+            logging_level = logging.DEBUG
+        else:
+            logging_level = logging.WARNING
+
+        logging.basicConfig(level=logging_level)

        # TODO(heckj): supporting backwards compatibility with environment
        # variables. To be removed after DEVSTACK is updated, ideally in