Merge "Unify the oslo_log import usage"

This commit is contained in:
Zuul 2017-10-24 00:21:43 +00:00 committed by Gerrit Code Review
commit d727bc3076
8 changed files with 16 additions and 16 deletions

View File

@ -20,13 +20,13 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log
from watcher.api import scheduling from watcher.api import scheduling
from watcher.common import service from watcher.common import service
from watcher import conf from watcher import conf
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF

View File

@ -20,14 +20,14 @@
import os import os
import sys import sys
from oslo_log import log as logging from oslo_log import log
from watcher.applier import manager from watcher.applier import manager
from watcher.applier import sync from watcher.applier import sync
from watcher.common import service as watcher_service from watcher.common import service as watcher_service
from watcher import conf from watcher import conf
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF

View File

@ -20,7 +20,7 @@
import os import os
import sys import sys
from oslo_log import log as logging from oslo_log import log
from watcher.common import service as watcher_service from watcher.common import service as watcher_service
from watcher import conf from watcher import conf
@ -29,7 +29,7 @@ from watcher.decision_engine import manager
from watcher.decision_engine import scheduling from watcher.decision_engine import scheduling
from watcher.decision_engine import sync from watcher.decision_engine import sync
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF

View File

@ -20,13 +20,13 @@
import sys import sys
from oslo_log import log as logging from oslo_log import log
from watcher.common import service as service from watcher.common import service as service
from watcher import conf from watcher import conf
from watcher.decision_engine import sync from watcher.decision_engine import sync
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF

View File

@ -11,11 +11,11 @@
# under the License. # under the License.
from oslo_context import context from oslo_context import context
from oslo_log import log as logging from oslo_log import log
from oslo_utils import timeutils from oslo_utils import timeutils
import six import six
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
class RequestContext(context.RequestContext): class RequestContext(context.RequestContext):

View File

@ -26,14 +26,14 @@ import functools
import sys import sys
from keystoneclient import exceptions as keystone_exceptions from keystoneclient import exceptions as keystone_exceptions
from oslo_log import log as logging from oslo_log import log
import six import six
from watcher._i18n import _ from watcher._i18n import _
from watcher import conf from watcher import conf
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF

View File

@ -24,7 +24,7 @@ import string
from croniter import croniter from croniter import croniter
from jsonschema import validators from jsonschema import validators
from oslo_log import log as logging from oslo_log import log
from oslo_utils import strutils from oslo_utils import strutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
import six import six
@ -35,7 +35,7 @@ from watcher import conf
CONF = conf.CONF CONF = conf.CONF
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
class Struct(dict): class Struct(dict):

View File

@ -16,13 +16,13 @@
import numbers import numbers
from oslo_log import log as logging from oslo_log import log
from watcher._i18n import _ from watcher._i18n import _
from watcher.common import exception from watcher.common import exception
from watcher.common import utils from watcher.common import utils
LOG = logging.getLogger(__name__) LOG = log.getLogger(__name__)
class IndicatorsMap(utils.Struct): class IndicatorsMap(utils.Struct):