diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2012-12-13 22:42:33 -0500 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-12 04:35:03 +0000 |
| commit | 751c35b1c8ff0730883a8ccdda9b77a49fff2405 (patch) | |
| tree | bbe4e6d95b6654ad5c6ba2d50cc6bbbd12c5678b /openstack/common/log.py | |
| parent | bd1e5a3350305cd6554ba3b0d537d670bf6b4a75 (diff) | |
| download | oslo-751c35b1c8ff0730883a8ccdda9b77a49fff2405.tar.gz oslo-751c35b1c8ff0730883a8ccdda9b77a49fff2405.tar.xz oslo-751c35b1c8ff0730883a8ccdda9b77a49fff2405.zip | |
Verbose should not enable debug level logging
Fixes LP #989269
Currently setting --verbose in will still allow DEBUG level
message to be logged to python logger object. we need to check
for --debug first (set DEBUG level), then --verbose (set INFO
level) and if neither is set then set default to WARNING
DocImpact
Change-Id: Ic9e3cb5979b2d7283552ad3a461870373f45a239
Diffstat (limited to 'openstack/common/log.py')
| -rw-r--r-- | openstack/common/log.py | 6 |
1 files changed, 4 insertions, 2 deletions
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: |