Merge "Remove pecan_debug option"

This commit is contained in:
Jenkins 2016-10-13 19:38:48 +00:00 committed by Gerrit Code Review
commit b3d1f00927
7 changed files with 3 additions and 33 deletions

View File

@ -23,9 +23,6 @@ OPTS = [
cfg.IntOpt('workers', default=1,
min=1,
help='Number of workers for aodh API server.'),
cfg.BoolOpt('pecan_debug',
default=False,
help='Toggle Pecan Debug Middleware.'),
cfg.BoolOpt('enable_combination_alarms',
default=False,
help="Enable deprecated combination alarms.",

View File

@ -51,7 +51,6 @@ def setup_app(pecan_config=PECAN_CONFIG, conf=None):
app = pecan.make_app(
pecan_config['app']['root'],
debug=conf.api.pecan_debug,
hooks=app_hooks,
wrap_app=middleware.ParsableErrorMiddleware,
guess_content_type_from_ext=False

View File

@ -72,9 +72,6 @@ class ConfigFixture(fixture.GabbiFixture):
group='api',
)
conf.set_override('pecan_debug', True, group='api',
enforce_type=True)
parsed_url = urlparse.urlparse(db_url)
if parsed_url.scheme != 'sqlite':
parsed_url = list(parsed_url)

View File

@ -238,7 +238,6 @@ function configure_aodh {
# NOTE: This must come after database configuration as those can
# call cleanup_aodh which will wipe the WSGI config.
if [ "$AODH_DEPLOY" == "mod_wsgi" ]; then
iniset $AODH_CONF api pecan_debug "False"
_aodh_config_apache_wsgi
elif [ "$AODH_DEPLOY" == "uwsgi" ]; then
# iniset creates these files when it's called if they don't exist.

View File

@ -51,16 +51,3 @@ work with a copy of Aodh installed via devstack.
On rpm-based systems::
$ service httpd reload
Limitation
==========
As Aodh is using Pecan and Pecan's DebugMiddleware doesn't support
multiple processes, there is no way to set debug mode in the multiprocessing
case. To allow multiple processes the DebugMiddleware may be turned off by
setting ``pecan_debug`` to ``False`` in the ``api`` section of
``aodh.conf``.
For other WSGI setup you can refer to the `pecan deployment`_ documentation.
.. _`pecan deployment`: http://pecan.readthedocs.org/en/latest/deployment.html#deployment

View File

@ -60,15 +60,3 @@ Run the server:
uwsgi_python --master --die-on-term --logto /var/log/aodh/aodh-api.log \
--http-socket :8042 --wsgi-file /usr/share/aodh-common/app.wsgi
Limitation
==========
As Aodh is using Pecan and Pecan's DebugMiddleware doesn't support
multiple processes, there is no way to set debug mode in the multiprocessing
case. To allow multiple processes the DebugMiddleware may be turned off by
setting ``pecan_debug`` to ``False`` in the ``api`` section of
``aodh.conf``.
For other WSGI setup you can refer to the `pecan deployment`_ documentation.
.. _`pecan deployment`: http://pecan.readthedocs.org/en/latest/deployment.html#deployment

View File

@ -0,0 +1,3 @@
---
upgrade:
- The api.pecan_debug option has been removed.