From 26f94e1a9c85696a9b5458977932e621dd06f06e Mon Sep 17 00:00:00 2001 From: "Chaozhe.Chen" Date: Sat, 26 Dec 2015 13:30:04 +0800 Subject: [PATCH] Trival: Remove unused logging import In some files, oslo_log.log has been imported but not used. So remove it. Change-Id: I2087abe45320464387bdb3916a62ea7823ffef65 --- ceilometer/agent/discovery/tenant.py | 3 --- ceilometer/agent/plugin_base.py | 3 --- ceilometer/compute/virt/hyperv/inspector.py | 2 -- ceilometer/compute/virt/hyperv/utilsv2.py | 2 -- ceilometer/network/notifications.py | 3 --- ceilometer/network/services/base.py | 4 ---- ceilometer/service.py | 2 -- ceilometer/storage/impl_db2.py | 3 --- 8 files changed, 22 deletions(-) diff --git a/ceilometer/agent/discovery/tenant.py b/ceilometer/agent/discovery/tenant.py index f69af3f9..8ae84688 100644 --- a/ceilometer/agent/discovery/tenant.py +++ b/ceilometer/agent/discovery/tenant.py @@ -13,12 +13,9 @@ # under the License. from oslo_config import cfg -from oslo_log import log from ceilometer.agent import plugin_base as plugin -LOG = log.getLogger(__name__) - cfg.CONF.import_group('service_credentials', 'ceilometer.keystone_client') diff --git a/ceilometer/agent/plugin_base.py b/ceilometer/agent/plugin_base.py index a5e95459..cc6a1006 100644 --- a/ceilometer/agent/plugin_base.py +++ b/ceilometer/agent/plugin_base.py @@ -19,15 +19,12 @@ import abc import collections from oslo_context import context -from oslo_log import log import oslo_messaging import six from stevedore import extension from ceilometer import messaging -LOG = log.getLogger(__name__) - ExchangeTopics = collections.namedtuple('ExchangeTopics', ['exchange', 'topics']) diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py index d81ab08f..a5070960 100644 --- a/ceilometer/compute/virt/hyperv/inspector.py +++ b/ceilometer/compute/virt/hyperv/inspector.py @@ -14,7 +14,6 @@ """Implementation of Inspector abstraction for Hyper-V""" from oslo_config import cfg -from oslo_log import log from oslo_utils import units from ceilometer.compute.pollsters import util @@ -23,7 +22,6 @@ from ceilometer.compute.virt import inspector as virt_inspector CONF = cfg.CONF -LOG = log.getLogger(__name__) class HyperVInspector(virt_inspector.Inspector): diff --git a/ceilometer/compute/virt/hyperv/utilsv2.py b/ceilometer/compute/virt/hyperv/utilsv2.py index 02fa25c9..a8e7992a 100644 --- a/ceilometer/compute/virt/hyperv/utilsv2.py +++ b/ceilometer/compute/virt/hyperv/utilsv2.py @@ -23,13 +23,11 @@ if sys.platform == 'win32': import wmi from oslo_config import cfg -from oslo_log import log as logging from ceilometer.compute.virt import inspector from ceilometer.i18n import _ CONF = cfg.CONF -LOG = logging.getLogger(__name__) class HyperVException(inspector.InspectorException): diff --git a/ceilometer/network/notifications.py b/ceilometer/network/notifications.py index 79220cec..4b5ca001 100644 --- a/ceilometer/network/notifications.py +++ b/ceilometer/network/notifications.py @@ -18,7 +18,6 @@ """ from oslo_config import cfg -from oslo_log import log import oslo_messaging from ceilometer.agent import plugin_base @@ -33,8 +32,6 @@ OPTS = [ cfg.CONF.register_opts(OPTS) -LOG = log.getLogger(__name__) - class NetworkNotificationBase(plugin_base.NotificationBase): diff --git a/ceilometer/network/services/base.py b/ceilometer/network/services/base.py index 251fde99..01233005 100644 --- a/ceilometer/network/services/base.py +++ b/ceilometer/network/services/base.py @@ -13,12 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log - from ceilometer.agent import plugin_base -LOG = log.getLogger(__name__) - # status map for converting metric status to volume int STATUS = { diff --git a/ceilometer/service.py b/ceilometer/service.py index 39db8a6a..0dfcab78 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -67,8 +67,6 @@ cfg.CONF.register_opt(COLL_OPT, 'collector') keystone_client.register_keystoneauth_opts(cfg.CONF) -LOG = log.getLogger(__name__) - def prepare_service(argv=None, config_files=None): oslo_i18n.enable_lazy() diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py index bc54d34a..5f67ada6 100644 --- a/ceilometer/storage/impl_db2.py +++ b/ceilometer/storage/impl_db2.py @@ -25,7 +25,6 @@ import sys import bson.code import bson.objectid from oslo_config import cfg -from oslo_log import log from oslo_utils import timeutils import pymongo import six @@ -38,8 +37,6 @@ from ceilometer.storage.mongo import utils as pymongo_utils from ceilometer.storage import pymongo_base from ceilometer import utils -LOG = log.getLogger(__name__) - AVAILABLE_CAPABILITIES = { 'resources': {'query': {'simple': True,