summaryrefslogtreecommitdiff
path: root/keystonemiddleware
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-05 18:05:17 +0000
committerGerrit Code Review <review@openstack.org>2017-06-05 18:05:17 +0000
commit1e06a64d4e68630bd285eec14db23fd6ef0e8742 (patch)
tree88408781ac924af79a8b9316e93a20207f2aa42d /keystonemiddleware
parentc86bbd076f1b9a16e7889a991a942ea16d0ed7be (diff)
parentba78db0b4b559dcc3b22c37834e430d8b27c45ae (diff)
downloadkeystonemiddleware-1e06a64d4e68630bd285eec14db23fd6ef0e8742.tar.gz
Merge "add a log when the option in conf can't be identitied"
Diffstat (limited to 'keystonemiddleware')
-rw-r--r--keystonemiddleware/_common/config.py6
-rw-r--r--keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py8
2 files changed, 12 insertions, 2 deletions
diff --git a/keystonemiddleware/_common/config.py b/keystonemiddleware/_common/config.py
index 883d377..0d5b290 100644
--- a/keystonemiddleware/_common/config.py
+++ b/keystonemiddleware/_common/config.py
@@ -13,6 +13,7 @@
import pkg_resources
from oslo_config import cfg
+from oslo_log import log as logging
import pbr
import six
@@ -21,6 +22,7 @@ from keystonemiddleware.i18n import _
CONF = cfg.CONF
_NOT_SET = object()
+_LOG = logging.getLogger(__name__)
def _conf_values_type_convert(group_name, all_options, conf):
@@ -53,8 +55,8 @@ def _conf_values_type_convert(group_name, all_options, conf):
v = type_(v)
except KeyError: # nosec
# This option is not known to auth_token. v is not converted.
- # FIXME(jamielennox): This should probably log a warning.
- pass
+ _LOG.warning(
+ 'The option "%s" in conf is not known to auth_token', k)
except ValueError as e:
raise exceptions.ConfigurationError(
_('Unable to convert the value of %(key)s option into correct '
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 2165660..1899cb0 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -491,6 +491,14 @@ class GeneralAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
middleware = auth_token.AuthProtocol(self.fake_app, conf)
self.assertEqual([servers], middleware._conf.get('memcached_servers'))
+ def test_conf_values_type_convert_with_wrong_key(self):
+ conf = {
+ 'wrong_key': '123'
+ }
+ log = 'The option "wrong_key" in conf is not known to auth_token'
+ auth_token.AuthProtocol(self.fake_app, conf)
+ self.assertThat(self.logger.output, matchers.Contains(log))
+
def test_conf_values_type_convert_with_wrong_value(self):
conf = {
'include_service_catalog': '123',