From 4b35ee2caec2d62942fcd652cde06ca5381f5666 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 20 Mar 2019 21:32:28 +0000 Subject: [PATCH] Revert "Centralize registration of logging options" This reverts commit b647919666a451092189f963786e367d0baa82be. It appears that this causes issues with cross project testing. Related-Bug: #1821092 Change-Id: Ic612aed0651c083ee5f0396cba07a179324d158b --- placement/conf/__init__.py | 5 +---- placement/wsgi.py | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/placement/conf/__init__.py b/placement/conf/__init__.py index 12233c2cd..9bac2e802 100644 --- a/placement/conf/__init__.py +++ b/placement/conf/__init__.py @@ -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) diff --git a/placement/wsgi.py b/placement/wsgi.py index c3387d074..c94092f60 100644 --- a/placement/wsgi.py +++ b/placement/wsgi.py @@ -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)