From a52d92be875e1bf3e2fce4ba708a97980551e944 Mon Sep 17 00:00:00 2001 From: zhangguoqing Date: Wed, 6 Apr 2016 10:34:39 +0800 Subject: [PATCH] Remove unused logging import and LOG global var In some modules the global LOG is not used any more. And the import of logging is not used. This patch removes the unused logging import and LOG vars. Change-Id: I794ee719d76f04e70154cf67f726152fbb1ba15a --- watcher/applier/actions/loading/default.py | 4 ---- watcher/applier/workflow_engine/loading/default.py | 4 ---- watcher/common/messaging/notification_handler.py | 2 -- watcher/db/sqlalchemy/api.py | 2 -- watcher/decision_engine/manager.py | 2 -- watcher/decision_engine/model/model_root.py | 4 ---- watcher/decision_engine/planner/loading/default.py | 4 ---- watcher/decision_engine/rpcapi.py | 2 -- watcher/decision_engine/solution/default.py | 4 ---- watcher/decision_engine/strategy/loading/default.py | 3 --- watcher/decision_engine/strategy/strategies/base.py | 4 ---- watcher/metrics_engine/cluster_history/ceilometer.py | 2 -- watcher/metrics_engine/cluster_model_collector/manager.py | 2 -- 13 files changed, 39 deletions(-) diff --git a/watcher/applier/actions/loading/default.py b/watcher/applier/actions/loading/default.py index 3ebab3742..0ec2f933c 100644 --- a/watcher/applier/actions/loading/default.py +++ b/watcher/applier/actions/loading/default.py @@ -17,12 +17,8 @@ from __future__ import unicode_literals -from oslo_log import log - from watcher.common.loader import default -LOG = log.getLogger(__name__) - class DefaultActionLoader(default.DefaultLoader): def __init__(self): diff --git a/watcher/applier/workflow_engine/loading/default.py b/watcher/applier/workflow_engine/loading/default.py index 6494987e1..5eba40475 100644 --- a/watcher/applier/workflow_engine/loading/default.py +++ b/watcher/applier/workflow_engine/loading/default.py @@ -17,12 +17,8 @@ from __future__ import unicode_literals -from oslo_log import log - from watcher.common.loader import default -LOG = log.getLogger(__name__) - class DefaultWorkFlowEngineLoader(default.DefaultLoader): def __init__(self): diff --git a/watcher/common/messaging/notification_handler.py b/watcher/common/messaging/notification_handler.py index b9aded99f..4c67ab1a1 100644 --- a/watcher/common/messaging/notification_handler.py +++ b/watcher/common/messaging/notification_handler.py @@ -15,14 +15,12 @@ # limitations under the License. import eventlet -from oslo_log import log import oslo_messaging as messaging from watcher.common.messaging.utils import observable eventlet.monkey_patch() -LOG = log.getLogger(__name__) class NotificationHandler(observable.Observable): diff --git a/watcher/db/sqlalchemy/api.py b/watcher/db/sqlalchemy/api.py index e87661365..f5eaecbcf 100644 --- a/watcher/db/sqlalchemy/api.py +++ b/watcher/db/sqlalchemy/api.py @@ -21,7 +21,6 @@ from oslo_config import cfg from oslo_db import exception as db_exc from oslo_db.sqlalchemy import session as db_session from oslo_db.sqlalchemy import utils as db_utils -from oslo_log import log from sqlalchemy.orm import exc from watcher import _i18n @@ -35,7 +34,6 @@ from watcher.objects import audit as audit_objects from watcher.objects import utils as objutils CONF = cfg.CONF -LOG = log.getLogger(__name__) _ = _i18n._ _FACADE = None diff --git a/watcher/decision_engine/manager.py b/watcher/decision_engine/manager.py index 90f597189..56446e26d 100644 --- a/watcher/decision_engine/manager.py +++ b/watcher/decision_engine/manager.py @@ -38,13 +38,11 @@ See :doc:`../architecture` for more details on this component. """ from oslo_config import cfg -from oslo_log import log from watcher.common.messaging import messaging_core from watcher.decision_engine.messaging import audit_endpoint -LOG = log.getLogger(__name__) CONF = cfg.CONF WATCHER_DECISION_ENGINE_OPTS = [ diff --git a/watcher/decision_engine/model/model_root.py b/watcher/decision_engine/model/model_root.py index eb5cda841..5ec65f9b1 100644 --- a/watcher/decision_engine/model/model_root.py +++ b/watcher/decision_engine/model/model_root.py @@ -13,16 +13,12 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from oslo_log import log - from watcher._i18n import _ from watcher.common import exception from watcher.decision_engine.model import hypervisor from watcher.decision_engine.model import mapping from watcher.decision_engine.model import vm -LOG = log.getLogger(__name__) - class ModelRoot(object): def __init__(self): diff --git a/watcher/decision_engine/planner/loading/default.py b/watcher/decision_engine/planner/loading/default.py index 010d8341c..c8896de39 100644 --- a/watcher/decision_engine/planner/loading/default.py +++ b/watcher/decision_engine/planner/loading/default.py @@ -17,12 +17,8 @@ from __future__ import unicode_literals -from oslo_log import log - from watcher.common.loader.default import DefaultLoader -LOG = log.getLogger(__name__) - class DefaultPlannerLoader(DefaultLoader): def __init__(self): diff --git a/watcher/decision_engine/rpcapi.py b/watcher/decision_engine/rpcapi.py index 47b0124b4..ddfa36103 100644 --- a/watcher/decision_engine/rpcapi.py +++ b/watcher/decision_engine/rpcapi.py @@ -18,7 +18,6 @@ # from oslo_config import cfg -from oslo_log import log from watcher.common import exception from watcher.common.messaging import messaging_core @@ -28,7 +27,6 @@ from watcher.decision_engine.manager import decision_engine_opt_group from watcher.decision_engine.manager import WATCHER_DECISION_ENGINE_OPTS -LOG = log.getLogger(__name__) CONF = cfg.CONF CONF.register_group(decision_engine_opt_group) diff --git a/watcher/decision_engine/solution/default.py b/watcher/decision_engine/solution/default.py index aa0a06337..9784c3525 100644 --- a/watcher/decision_engine/solution/default.py +++ b/watcher/decision_engine/solution/default.py @@ -16,14 +16,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from oslo_log import log - from watcher.applier.actions import base as baction from watcher.common import exception from watcher.decision_engine.solution import base -LOG = log.getLogger(__name__) - class DefaultSolution(base.BaseSolution): def __init__(self): diff --git a/watcher/decision_engine/strategy/loading/default.py b/watcher/decision_engine/strategy/loading/default.py index 9059bf617..d44b893da 100644 --- a/watcher/decision_engine/strategy/loading/default.py +++ b/watcher/decision_engine/strategy/loading/default.py @@ -19,12 +19,9 @@ from __future__ import unicode_literals -from oslo_log import log from watcher.common.loader import default -LOG = log.getLogger(__name__) - class DefaultStrategyLoader(default.DefaultLoader): def __init__(self): diff --git a/watcher/decision_engine/strategy/strategies/base.py b/watcher/decision_engine/strategy/strategies/base.py index 375ae5336..20ca17cb5 100644 --- a/watcher/decision_engine/strategy/strategies/base.py +++ b/watcher/decision_engine/strategy/strategies/base.py @@ -37,16 +37,12 @@ which are dynamically loaded by Watcher at launch time. """ import abc - -from oslo_log import log import six from watcher.common import clients from watcher.decision_engine.solution import default from watcher.decision_engine.strategy.common import level -LOG = log.getLogger(__name__) - @six.add_metaclass(abc.ABCMeta) class BaseStrategy(object): diff --git a/watcher/metrics_engine/cluster_history/ceilometer.py b/watcher/metrics_engine/cluster_history/ceilometer.py index 56b29ddad..83e0c03fb 100644 --- a/watcher/metrics_engine/cluster_history/ceilometer.py +++ b/watcher/metrics_engine/cluster_history/ceilometer.py @@ -19,13 +19,11 @@ from oslo_config import cfg -from oslo_log import log from watcher.common import ceilometer_helper from watcher.metrics_engine.cluster_history import base CONF = cfg.CONF -LOG = log.getLogger(__name__) class CeilometerClusterHistory(base.BaseClusterHistory): diff --git a/watcher/metrics_engine/cluster_model_collector/manager.py b/watcher/metrics_engine/cluster_model_collector/manager.py index 752737e3a..a65d0e0bc 100644 --- a/watcher/metrics_engine/cluster_model_collector/manager.py +++ b/watcher/metrics_engine/cluster_model_collector/manager.py @@ -18,13 +18,11 @@ # from oslo_config import cfg -from oslo_log import log from watcher.common import nova_helper from watcher.metrics_engine.cluster_model_collector import nova as cnova -LOG = log.getLogger(__name__) CONF = cfg.CONF