diff options
Diffstat (limited to 'openstack/common')
-rw-r--r-- | openstack/common/cfg.py | 6 | ||||
-rw-r--r-- | openstack/common/log.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py index 8f25c5c..a6500eb 100644 --- a/openstack/common/cfg.py +++ b/openstack/common/cfg.py @@ -1735,11 +1735,13 @@ class CommonConfigOpts(ConfigOpts): BoolOpt('debug', short='d', default=False, - help='Print debugging output'), + help='Print debugging output (set logging level to ' + 'DEBUG instead of default WARNING level).'), BoolOpt('verbose', short='v', default=False, - help='Print more verbose output'), + help='Print more verbose output (set logging level to ' + 'INFO instead of default WARNING level).'), ] logging_cli_opts = [ diff --git a/openstack/common/log.py b/openstack/common/log.py index d88a2c9..7fc9b83 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -361,10 +361,12 @@ def _setup_logging_from_conf(product_name): datefmt=datefmt)) handler.setFormatter(LegacyFormatter(datefmt=datefmt)) - if CONF.verbose or CONF.debug: + if CONF.debug: log_root.setLevel(logging.DEBUG) - else: + elif CONF.verbose: log_root.setLevel(logging.INFO) + else: + log_root.setLevel(logging.WARNING) level = logging.NOTSET for pair in CONF.default_log_levels: |