Merge "Revert "Centralize registration of logging options""
This commit is contained in:
commit
c2a9bcad38
@ -14,8 +14,6 @@
|
||||
# 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
|
||||
@ -23,7 +21,7 @@ from placement.conf import paths
|
||||
from placement.conf import placement
|
||||
|
||||
|
||||
# To avoid global config, we require an existing ConfigOpts to be passed
|
||||
# To avoid global config, we require an existing ConfigOpts is 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):
|
||||
@ -32,4 +30,3 @@ def register_opts(conf):
|
||||
database.register_opts(conf)
|
||||
paths.register_opts(conf)
|
||||
placement.register_opts(conf)
|
||||
logging.register_options(conf)
|
||||
|
@ -71,6 +71,7 @@ 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)
|
||||
|
Loading…
Reference in New Issue
Block a user