don't setup logging or cors when not needed

publisher/dispatcher are used by ceilometer which already has logging
set up. don't do it again.

Change-Id: I13ec9797b2794f910b55adbc70d47892ce4cdddf
Closes-Bug: #1666174
(cherry picked from commit 3fbfd60e45)
This commit is contained in:
gord chung 2017-02-28 12:17:25 -05:00 committed by Julien Danjou
parent 3d5af93ca6
commit 9a9ae04a86
2 changed files with 8 additions and 6 deletions

View File

@ -40,7 +40,7 @@ class DatabaseDispatcher(object):
def __init__(self, conf):
# NOTE(jd) The `conf' arg is the Ceilometer conf, but we don't really
# need it here.
conf = service.prepare_service([])
conf = service.prepare_service([], share=True)
self.conn = storage.get_connection_from_config(conf)
def record_events(self, events):

View File

@ -25,15 +25,16 @@ from panko import opts
from panko import version
def prepare_service(argv=None, config_files=None):
def prepare_service(argv=None, config_files=None, share=False):
conf = cfg.ConfigOpts()
oslo_i18n.enable_lazy()
for group, options in opts.list_opts():
conf.register_opts(list(options),
group=None if group == "DEFAULT" else group)
defaults.set_cors_middleware_defaults()
db_options.set_defaults(conf)
log.register_options(conf)
if not share:
defaults.set_cors_middleware_defaults()
oslo_i18n.enable_lazy()
log.register_options(conf)
if argv is None:
argv = sys.argv
@ -41,7 +42,8 @@ def prepare_service(argv=None, config_files=None):
version=version.version_info.version_string(),
default_config_files=config_files)
log.setup(conf, 'panko')
if not share:
log.setup(conf, 'panko')
# NOTE(liusheng): guru cannot run with service under apache daemon, so when
# panko-api running with mod_wsgi, the argv is [], we don't start
# guru.