openstack
/
placement
Code Issues Proposed changes

Merge "Centralize registration of logging options"

This commit is contained in:
Zuul 2019-03-20 16:13:27 +00:00 committed by Gerrit Code Review
parent f0b33d6103 b647919666
commit 8ca3ad1bf1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
placement/conf/__init__.py
View File

@ -14,6 +14,8 @@
# under the License.
from __future__ import absolute_import
from oslo_log import log as logging
from placement.conf import api
from placement.conf import base
from placement.conf import database
@ -21,7 +23,7 @@ from placement.conf import paths
from placement.conf import placement
# To avoid global config, we require an existing ConfigOpts is passed
# To avoid global config, we require an existing ConfigOpts to be passed
# to register_opts. Then the caller can have some assurance that the
# config they are using will maintain some independence.
def register_opts(conf):
@ -30,3 +32,4 @@ def register_opts(conf):
database.register_opts(conf)
paths.register_opts(conf)
placement.register_opts(conf)
logging.register_options(conf)

1
placement/wsgi.py
View File

@ -71,7 +71,6 @@ def _get_config_files(env=None):
def _parse_args(config, argv, default_config_files):
# register placement's config options
conf.register_opts(config)
logging.register_options(config)
if profiler:
profiler.set_defaults(config)