diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-13 00:25:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-13 00:25:04 +0000 |
| commit | d74668fbedc29aa4b7868fd3fb8a28d326f43d52 (patch) | |
| tree | e8d8d8a6be78235cf7b19b821bcbd68e4cc35690 /openstack/common | |
| parent | 7667c3398947b7ec5d5f6748d1bc66ab0d216d34 (diff) | |
| parent | 751c35b1c8ff0730883a8ccdda9b77a49fff2405 (diff) | |
| download | oslo-d74668fbedc29aa4b7868fd3fb8a28d326f43d52.tar.gz oslo-d74668fbedc29aa4b7868fd3fb8a28d326f43d52.tar.xz oslo-d74668fbedc29aa4b7868fd3fb8a28d326f43d52.zip | |
Merge "Verbose should not enable debug level logging"
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 37f405b..0be34a5 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: |