openstack/aodh
Code Issues Proposed changes

Merge "update default_log_levels set by ceilometer"

Browse Source
This commit is contained in:
Jenkins 2014-07-04 20:21:24 +00:00 committed by Gerrit Code Review
commit 8b8b8f2a8e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ceilometer/service.py
View File

@ -87,6 +87,8 @@ CLI_OPTIONS = [
] ]
cfg.CONF.register_cli_opts(CLI_OPTIONS, group="service_credentials") cfg.CONF.register_cli_opts(CLI_OPTIONS, group="service_credentials")
cfg.CONF.import_opt('default_log_levels',
'ceilometer.openstack.common.log')
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -110,15 +112,10 @@ def get_workers(name):
def prepare_service(argv=None): def prepare_service(argv=None):
gettextutils.install('ceilometer', lazy=True) gettextutils.install('ceilometer', lazy=True)
gettextutils.enable_lazy() gettextutils.enable_lazy()
log_levels = (cfg.CONF.default_log_levels +
['stevedore=INFO', 'keystoneclient=INFO'])
cfg.set_defaults(log.log_opts, cfg.set_defaults(log.log_opts,
default_log_levels=['amqplib=WARN', default_log_levels=log_levels)
'qpid.messaging=INFO',
'sqlalchemy=WARN',
'keystoneclient=INFO',
'stevedore=INFO',
'eventlet.wsgi.server=WARN',
'iso8601=WARN'
])
if argv is None: if argv is None:
argv = sys.argv argv = sys.argv
cfg.CONF(argv[1:], project='ceilometer') cfg.CONF(argv[1:], project='ceilometer')