diff options
| author | ZhiQiang Fan <zhiqiang.fan@huawei.com> | 2015-01-16 18:35:10 +0800 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2015-05-28 11:08:02 -0400 |
| commit | c612727ff8a166e27154e5b3d62a2943f227446a (patch) | |
| tree | 7151bbb00e4b74b567e62be3e66a881ce205022d /ceilometer/service.py | |
| parent | 348c2263b646229f5665ab24bea988359103722e (diff) | |
| download | ceilometer-c612727ff8a166e27154e5b3d62a2943f227446a.tar.gz | |
use oslo.log instead of oslo-incubator code
oslo.log has graduated from oslo-incubator, and openstack.common.log
has been removed from oslo-incubator, so let's use the new one.
NOTE1:openstack.common.log registers its options at import time, but
oslo.log needs to call register_options() explicitly.
NOTE2: split unit test case in tests/objectstore/test_swift_middleware.py
to avoid duplicate cli option register exception, see NOTE1.
Change-Id: Ida30808dbe0c584919755c207ca4ee4b91963a17
Diffstat (limited to 'ceilometer/service.py')
| -rw-r--r-- | ceilometer/service.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ceilometer/service.py b/ceilometer/service.py index b058c8db..99eb4e3f 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -20,10 +20,10 @@ import sys from oslo_config import cfg import oslo_i18n +from oslo_log import log from ceilometer.i18n import _ from ceilometer import messaging -from ceilometer.openstack.common import log from ceilometer import utils @@ -109,12 +109,12 @@ def get_workers(name): def prepare_service(argv=None): oslo_i18n.enable_lazy() + log.register_options(cfg.CONF) log_levels = (cfg.CONF.default_log_levels + ['stevedore=INFO', 'keystoneclient=INFO']) - cfg.set_defaults(log.log_opts, - default_log_levels=log_levels) + log.set_defaults(default_log_levels=log_levels) if argv is None: argv = sys.argv cfg.CONF(argv[1:], project='ceilometer', validate_default_values=True) - log.setup('ceilometer') + log.setup(cfg.CONF, 'ceilometer') messaging.setup() |