openstack/aodh
Code Issues Proposed changes

use oslo.log instead of oslo-incubator code

Browse Source 
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
This commit is contained in:
ZhiQiang Fan
2015-01-16 18:35:10 +08:00
committed by gordon chung
parent 348c2263b6
commit c612727ff8
95 changed files with 114 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/pipeline.py
View File

@@ -22,13 +22,13 @@ import fnmatch
import os
from oslo_config import cfg
from oslo_log import log
from oslo_utils import timeutils
import six
import yaml
from ceilometer.event.storage import models
from ceilometer.i18n import _
from ceilometer.openstack.common import log
from ceilometer import publisher
from ceilometer.publisher import utils as publisher_utils
from ceilometer import sample as sample_util