openstack/aodh
Code Issues Proposed changes

Merge "Do not default pecan_debug to CONF.debug"

Browse Source
This commit is contained in:
Jenkins 2015-02-26 23:47:36 +00:00 committed by Gerrit Code Review
commit 98fa79a868
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/api/app.py
View File

@ -46,9 +46,8 @@ OPTS = [
API_OPTS = [
cfg.BoolOpt('pecan_debug',
help='Toggle Pecan Debug Middleware. '
'If it is not set, global debug value will be used.'
),
default=False,
help='Toggle Pecan Debug Middleware.'),
]
CONF.register_opts(OPTS)
@ -78,8 +77,6 @@ def setup_app(pecan_config=None, extra_hooks=None):
pecan.configuration.set_config(dict(pecan_config), overwrite=True)
cfg.set_defaults(API_OPTS, pecan_debug=CONF.debug)
# NOTE(sileht): pecan debug won't work in multi-process environment
pecan_debug = CONF.api.pecan_debug
if service.get_workers('api') != 1 and pecan_debug:

2
ceilometer/tests/api/test_app.py
View File

@ -50,7 +50,7 @@ class TestApp(base.BaseTestCase):
self.assertEqual(expected, kwargs.get('debug'))
_check_pecan_debug(g_debug=False, p_debug=None, expected=False)
_check_pecan_debug(g_debug=True, p_debug=None, expected=True)
_check_pecan_debug(g_debug=True, p_debug=None, expected=False)
_check_pecan_debug(g_debug=True, p_debug=False, expected=False)
_check_pecan_debug(g_debug=False, p_debug=True, expected=True)
_check_pecan_debug(g_debug=True, p_debug=None, expected=False,