diff options
| author |   DUVAL Thomas <thomas.duval@orange.com> | 2016-06-09 09:11:50 +0200 |
|---|---|---|
| committer | DUVAL Thomas <thomas.duval@orange.com> | 2016-06-09 09:11:50 +0200 |
| commit | 2e7b4f2027a1147ca28301e4f88adf8274b39a1f (patch) | |
| tree | 8b8d94001ebe6cc34106cf813b538911a8d66d9a /keystone-moon/keystone/server/common.py | |
| parent | a33bdcb627102a01244630a54cb4b5066b385a6a (diff) | |
Update Keystone core to Mitaka.
Change-Id: Ia10d6add16f4a9d25d1f42d420661c46332e69db
Diffstat (limited to 'keystone-moon/keystone/server/common.py')
| -rw-r--r-- | keystone-moon/keystone/server/common.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keystone-moon/keystone/server/common.py b/keystone-moon/keystone/server/common.py index 7bc5958e..4b1ee469 100644 --- a/keystone-moon/keystone/server/common.py +++ b/keystone-moon/keystone/server/common.py @@ -15,9 +15,9 @@ from oslo_config import cfg from oslo_log import log +from keystone.common import config from keystone.common import dependency from keystone.common import sql -from keystone import config from keystone.i18n import _LW from keystone.server import backends @@ -30,7 +30,7 @@ def configure(version=None, config_files=None, pre_setup_logging_fn=lambda: None): config.configure() sql.initialize() - config.set_default_for_default_log_levels() + config.set_config_defaults() CONF(project='keystone', version=version, default_config_files=config_files) @@ -38,9 +38,9 @@ def configure(version=None, config_files=None, pre_setup_logging_fn() config.setup_logging() - if CONF.debug: - LOG.warn(_LW( - 'debug is enabled so responses may include sensitive ' + if CONF.insecure_debug: + LOG.warning(_LW( + 'insecure_debug is enabled so responses may include sensitive ' 'information.')) |