From 62a45027b8362d3c72897beb445b2e325a54de87 Mon Sep 17 00:00:00 2001 From: Tong Li Date: Sat, 8 Aug 2015 09:59:04 -0400 Subject: [PATCH] remove old oslo.config and use new oslo_config Change-Id: Ic955ab24843c2c1c58748fdefde75356e0bb47df --- kiloeyes/api/monasca_api_v2.py | 2 +- kiloeyes/api/server.py | 16 +++++++------ kiloeyes/common/constant.py | 23 +++++++++++++++++++ kiloeyes/common/email_sender.py | 2 +- kiloeyes/common/es_conn.py | 2 +- kiloeyes/common/kafka_conn.py | 2 +- kiloeyes/common/resource_api.py | 2 +- kiloeyes/dispatcher/sample_dispatcher.py | 2 +- kiloeyes/microservice/es_persister.py | 2 +- kiloeyes/microservice/fixed_strategy.py | 2 +- kiloeyes/microservice/metrics_fixer.py | 2 +- kiloeyes/microservice/notification_engine.py | 2 +- .../microservice/notification_processor.py | 2 +- kiloeyes/microservice/server.py | 2 +- kiloeyes/microservice/threshold_engine.py | 10 ++++---- kiloeyes/microservice/threshold_processor.py | 5 ++-- kiloeyes/microservice/timed_strategy.py | 2 +- .../openstack/common/eventlet_backdoor.py | 2 +- kiloeyes/openstack/common/fileutils.py | 2 +- kiloeyes/openstack/common/loopingcall.py | 2 +- kiloeyes/openstack/common/service.py | 2 +- kiloeyes/openstack/common/systemd.py | 2 +- kiloeyes/openstack/common/threadgroup.py | 2 +- kiloeyes/service.py | 19 +++++++-------- .../common/test_alarm_expr_calculator.py | 7 +++--- .../tests/common/test_alarm_expr_parser.py | 3 ++- .../tests/common/test_alarm_expr_validator.py | 7 +++--- kiloeyes/tests/common/test_email_sender.py | 2 +- kiloeyes/tests/common/test_es_conn.py | 10 ++++---- .../tests/microservice/test_metrics_fixer.py | 2 +- .../test_notification_processor.py | 2 +- kiloeyes/tests/microservice/test_strategy.py | 2 +- .../microservice/test_threshold_processor.py | 2 +- kiloeyes/v2/elasticsearch/alarmdefinitions.py | 2 +- kiloeyes/v2/elasticsearch/alarms.py | 2 +- kiloeyes/v2/elasticsearch/metrics.py | 2 +- .../v2/elasticsearch/notificationmethods.py | 2 +- kiloeyes/v2/elasticsearch/versions.py | 2 +- requirements.txt | 2 ++ 39 files changed, 94 insertions(+), 66 deletions(-) create mode 100755 kiloeyes/common/constant.py diff --git a/kiloeyes/api/monasca_api_v2.py b/kiloeyes/api/monasca_api_v2.py index cc0c597..caf9da1 100755 --- a/kiloeyes/api/monasca_api_v2.py +++ b/kiloeyes/api/monasca_api_v2.py @@ -13,7 +13,7 @@ # under the License. from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log LOG = log.getLogger(__name__) diff --git a/kiloeyes/api/server.py b/kiloeyes/api/server.py index 4006d70..e412ce6 100755 --- a/kiloeyes/api/server.py +++ b/kiloeyes/api/server.py @@ -13,16 +13,15 @@ # under the License. import os -from wsgiref import simple_server - from oslo_config import cfg +from oslo_log import log import paste.deploy from stevedore import named +from wsgiref import simple_server - +from kiloeyes.common import constant from kiloeyes.common import namespace from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log OPTS = [ cfg.MultiStrOpt('dispatcher', @@ -35,10 +34,13 @@ LOG = log.getLogger(__name__) def api_app(conf): + log.set_defaults(constant.KILOEYES_LOGGING_CONTEXT_FORMAT, + constant.KILOEYES_LOG_LEVELS) + log.register_options(cfg.CONF) + cfg.CONF(args=[], project='kiloeyes') - log_levels = (cfg.CONF.default_log_levels) - cfg.set_defaults(log.log_opts, default_log_levels=log_levels) - log.setup('kiloeyes') + + log.setup(cfg.CONF, 'kiloeyes') dispatcher_manager = named.NamedExtensionManager( namespace=namespace.DISPATCHER_NS, diff --git a/kiloeyes/common/constant.py b/kiloeyes/common/constant.py new file mode 100755 index 0000000..9cbdb99 --- /dev/null +++ b/kiloeyes/common/constant.py @@ -0,0 +1,23 @@ +# Copyright 2013 IBM Corp +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +KILOEYES_LOG_LEVELS = ['oslo_messaging=INFO', 'iso8601=WARN', + 'requests.packages.urllib3.connectionpool=WARN', + 'urllib3.connectionpool=WARN', 'websocket=WARN', + 'stevedore=WARN', 'kiloeyes=WARN'] + +KILOEYES_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' + '%(levelname)s %(name)s [%(request_id)s ' + '%(user_identity)s] %(instance)s' + '%(message)s') diff --git a/kiloeyes/common/email_sender.py b/kiloeyes/common/email_sender.py index 4001134..090c688 100755 --- a/kiloeyes/common/email_sender.py +++ b/kiloeyes/common/email_sender.py @@ -16,7 +16,7 @@ import email.mime.text from oslo_config import cfg import smtplib -from kiloeyes.openstack.common import log +from oslo_log import log MAILSENDER_OPTS = [ cfg.StrOpt('username', diff --git a/kiloeyes/common/es_conn.py b/kiloeyes/common/es_conn.py index c3ff7fd..255d4f5 100755 --- a/kiloeyes/common/es_conn.py +++ b/kiloeyes/common/es_conn.py @@ -16,7 +16,7 @@ from oslo_config import cfg import requests import ujson as json -from kiloeyes.openstack.common import log +from oslo_log import log ES_OPTS = [ diff --git a/kiloeyes/common/kafka_conn.py b/kiloeyes/common/kafka_conn.py index e3957dc..326b57d 100755 --- a/kiloeyes/common/kafka_conn.py +++ b/kiloeyes/common/kafka_conn.py @@ -26,7 +26,7 @@ try: except ImportError: import json -from kiloeyes.openstack.common import log +from oslo_log import log KAFKA_OPTS = [ diff --git a/kiloeyes/common/resource_api.py b/kiloeyes/common/resource_api.py index c5139a1..126f48c 100755 --- a/kiloeyes/common/resource_api.py +++ b/kiloeyes/common/resource_api.py @@ -15,7 +15,7 @@ import falcon from falcon import api_helpers -from kiloeyes.openstack.common import log +from oslo_log import log RESOURCE_METHOD_FLAG = 'fab05a04-b861-4651-bd0c-9cb3eb9a6088' diff --git a/kiloeyes/dispatcher/sample_dispatcher.py b/kiloeyes/dispatcher/sample_dispatcher.py index fb3bd9e..c6fb563 100755 --- a/kiloeyes/dispatcher/sample_dispatcher.py +++ b/kiloeyes/dispatcher/sample_dispatcher.py @@ -17,7 +17,7 @@ from oslo_config import cfg from kiloeyes.api import monasca_api_v2 from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log OPTS = [ cfg.MultiStrOpt('id', diff --git a/kiloeyes/microservice/es_persister.py b/kiloeyes/microservice/es_persister.py index c983c3d..1257aea 100755 --- a/kiloeyes/microservice/es_persister.py +++ b/kiloeyes/microservice/es_persister.py @@ -14,12 +14,12 @@ # under the License. from oslo_config import cfg +from oslo_log import log from stevedore import driver from kiloeyes.common import es_conn from kiloeyes.common import kafka_conn from kiloeyes.common import namespace -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import service as os_service OPTS = [ diff --git a/kiloeyes/microservice/fixed_strategy.py b/kiloeyes/microservice/fixed_strategy.py index 97fb487..02231d9 100755 --- a/kiloeyes/microservice/fixed_strategy.py +++ b/kiloeyes/microservice/fixed_strategy.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from kiloeyes.openstack.common import log +from oslo_log import log LOG = log.getLogger(__name__) diff --git a/kiloeyes/microservice/metrics_fixer.py b/kiloeyes/microservice/metrics_fixer.py index 3246d8d..8738b22 100755 --- a/kiloeyes/microservice/metrics_fixer.py +++ b/kiloeyes/microservice/metrics_fixer.py @@ -17,7 +17,7 @@ import hashlib import json import time -from kiloeyes.openstack.common import log +from oslo_log import log LOG = log.getLogger(__name__) diff --git a/kiloeyes/microservice/notification_engine.py b/kiloeyes/microservice/notification_engine.py index 292460f..9871544 100755 --- a/kiloeyes/microservice/notification_engine.py +++ b/kiloeyes/microservice/notification_engine.py @@ -13,12 +13,12 @@ # under the License. from oslo_config import cfg +from oslo_log import log from stevedore import driver from kiloeyes.common import es_conn from kiloeyes.common import kafka_conn from kiloeyes.common import namespace -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import service as os_service NOTIFICATION_ENGINE_OPTS = [ diff --git a/kiloeyes/microservice/notification_processor.py b/kiloeyes/microservice/notification_processor.py index 1b81bb8..a50b436 100755 --- a/kiloeyes/microservice/notification_processor.py +++ b/kiloeyes/microservice/notification_processor.py @@ -14,7 +14,7 @@ import json from kiloeyes.common import email_sender -from kiloeyes.openstack.common import log +from oslo_log import log LOG = log.getLogger(__name__) diff --git a/kiloeyes/microservice/server.py b/kiloeyes/microservice/server.py index 4005a58..11f61ab 100755 --- a/kiloeyes/microservice/server.py +++ b/kiloeyes/microservice/server.py @@ -14,10 +14,10 @@ # under the License. from oslo_config import cfg +from oslo_log import log from stevedore import driver from kiloeyes.common import namespace -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import service as os_service from kiloeyes import service diff --git a/kiloeyes/microservice/threshold_engine.py b/kiloeyes/microservice/threshold_engine.py index 5e36b93..d9d7547 100755 --- a/kiloeyes/microservice/threshold_engine.py +++ b/kiloeyes/microservice/threshold_engine.py @@ -12,16 +12,16 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import cfg +from oslo_log import log +from stevedore import driver +import threading +import time from kiloeyes.common import es_conn from kiloeyes.common import kafka_conn from kiloeyes.common import namespace -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import service as os_service -from oslo_config import cfg -from stevedore import driver -import threading -import time lock = threading.RLock() diff --git a/kiloeyes/microservice/threshold_processor.py b/kiloeyes/microservice/threshold_processor.py index 1571f47..fa5e26c 100755 --- a/kiloeyes/microservice/threshold_processor.py +++ b/kiloeyes/microservice/threshold_processor.py @@ -15,11 +15,12 @@ import collections import copy import json +from oslo_log import log +import uuid + from kiloeyes.common import alarm_expr_calculator as calculator from kiloeyes.common import alarm_expr_parser as parser -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import timeutils as tu -import uuid LOG = log.getLogger(__name__) diff --git a/kiloeyes/microservice/timed_strategy.py b/kiloeyes/microservice/timed_strategy.py index d744a8e..8fad616 100755 --- a/kiloeyes/microservice/timed_strategy.py +++ b/kiloeyes/microservice/timed_strategy.py @@ -18,7 +18,7 @@ import dateutil.parser as dparser from oslo_config import cfg import time -from kiloeyes.openstack.common import log +from oslo_log import log """ diff --git a/kiloeyes/openstack/common/eventlet_backdoor.py b/kiloeyes/openstack/common/eventlet_backdoor.py index 9d780bd..8bfaf5d 100755 --- a/kiloeyes/openstack/common/eventlet_backdoor.py +++ b/kiloeyes/openstack/common/eventlet_backdoor.py @@ -30,7 +30,7 @@ import greenlet from oslo_config import cfg from kiloeyes.openstack.common.gettextutils import _LI -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging help_for_backdoor_port = ( "Acceptable values are 0, , and :, where 0 results " diff --git a/kiloeyes/openstack/common/fileutils.py b/kiloeyes/openstack/common/fileutils.py index 11f9fe2..7beeb61 100755 --- a/kiloeyes/openstack/common/fileutils.py +++ b/kiloeyes/openstack/common/fileutils.py @@ -19,7 +19,7 @@ import os import tempfile from kiloeyes.openstack.common import excutils -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/kiloeyes/openstack/common/loopingcall.py b/kiloeyes/openstack/common/loopingcall.py index 2a87bdd..bfb732a 100755 --- a/kiloeyes/openstack/common/loopingcall.py +++ b/kiloeyes/openstack/common/loopingcall.py @@ -22,7 +22,7 @@ from eventlet import event from eventlet import greenthread from kiloeyes.openstack.common.gettextutils import _LE, _LW -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/kiloeyes/openstack/common/service.py b/kiloeyes/openstack/common/service.py index ed65169..87a5af7 100755 --- a/kiloeyes/openstack/common/service.py +++ b/kiloeyes/openstack/common/service.py @@ -40,7 +40,7 @@ from oslo_config import cfg from kiloeyes.openstack.common import eventlet_backdoor from kiloeyes.openstack.common.gettextutils import _LE, _LI, _LW from kiloeyes.openstack.common import importutils -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging from kiloeyes.openstack.common import systemd from kiloeyes.openstack.common import threadgroup diff --git a/kiloeyes/openstack/common/systemd.py b/kiloeyes/openstack/common/systemd.py index 0794bd8..52bbeda 100755 --- a/kiloeyes/openstack/common/systemd.py +++ b/kiloeyes/openstack/common/systemd.py @@ -20,7 +20,7 @@ import os import socket import sys -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/kiloeyes/openstack/common/threadgroup.py b/kiloeyes/openstack/common/threadgroup.py index 3177327..2025c37 100755 --- a/kiloeyes/openstack/common/threadgroup.py +++ b/kiloeyes/openstack/common/threadgroup.py @@ -16,7 +16,7 @@ import threading import eventlet from eventlet import greenpool -from kiloeyes.openstack.common import log as logging +from oslo_log import log as logging from kiloeyes.openstack.common import loopingcall diff --git a/kiloeyes/service.py b/kiloeyes/service.py index 9ac81e3..c9f2efc 100755 --- a/kiloeyes/service.py +++ b/kiloeyes/service.py @@ -14,26 +14,23 @@ # License for the specific language governing permissions and limitations # under the License. -import sys from oslo_config import cfg +from oslo_log import log +import sys -from kiloeyes.openstack.common import gettextutils -from kiloeyes.openstack.common import log - - -cfg.CONF.import_opt('default_log_levels', 'kiloeyes.openstack.common.log') +from kiloeyes.common import constant LOG = log.getLogger(__name__) def prepare_service(argv=None): - gettextutils.install('kiloeyes') - gettextutils.enable_lazy() - log_levels = (cfg.CONF.default_log_levels) - cfg.set_defaults(log.log_opts, default_log_levels=log_levels) + log.set_defaults(constant.KILOEYES_LOGGING_CONTEXT_FORMAT, + constant.KILOEYES_LOG_LEVELS) + log.register_options(cfg.CONF) + if argv is None: argv = sys.argv cfg.CONF(argv[1:], project='kiloeyes') - log.setup('kiloeyes') + log.setup(cfg.CONF, 'kiloeyes') LOG.info('Service has started!') diff --git a/kiloeyes/tests/common/test_alarm_expr_calculator.py b/kiloeyes/tests/common/test_alarm_expr_calculator.py index 544562a..4376f97 100755 --- a/kiloeyes/tests/common/test_alarm_expr_calculator.py +++ b/kiloeyes/tests/common/test_alarm_expr_calculator.py @@ -12,12 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -from kiloeyes.common import alarm_expr_calculator as calculator -from kiloeyes.openstack.common import log -from kiloeyes import tests +from oslo_log import log import random import time +from kiloeyes.common import alarm_expr_calculator as calculator +from kiloeyes import tests + LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/common/test_alarm_expr_parser.py b/kiloeyes/tests/common/test_alarm_expr_parser.py index bec2496..601e017 100755 --- a/kiloeyes/tests/common/test_alarm_expr_parser.py +++ b/kiloeyes/tests/common/test_alarm_expr_parser.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log + from kiloeyes.common import alarm_expr_parser -from kiloeyes.openstack.common import log from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/common/test_alarm_expr_validator.py b/kiloeyes/tests/common/test_alarm_expr_validator.py index d0b18d6..3b14f80 100755 --- a/kiloeyes/tests/common/test_alarm_expr_validator.py +++ b/kiloeyes/tests/common/test_alarm_expr_validator.py @@ -14,10 +14,11 @@ # under the License. import json -from kiloeyes.common import alarm_expr_validator as validator -from kiloeyes.openstack.common import log -from kiloeyes import tests import os +from oslo_log import log + +from kiloeyes.common import alarm_expr_validator as validator +from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/common/test_email_sender.py b/kiloeyes/tests/common/test_email_sender.py index 65701bb..63cc056 100755 --- a/kiloeyes/tests/common/test_email_sender.py +++ b/kiloeyes/tests/common/test_email_sender.py @@ -14,10 +14,10 @@ import email.mime.text import mock +from oslo_log import log import smtplib from kiloeyes.common import email_sender -from kiloeyes.openstack.common import log from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/common/test_es_conn.py b/kiloeyes/tests/common/test_es_conn.py index ea83bfb..ec9cd06 100755 --- a/kiloeyes/tests/common/test_es_conn.py +++ b/kiloeyes/tests/common/test_es_conn.py @@ -12,16 +12,16 @@ # License for the specific language governing permissions and limitations # under the License. +import json +import mock +from oslo_log import log +import requests + from kiloeyes.common import es_conn from kiloeyes.microservice import timed_strategy from kiloeyes.openstack.common.fixture import config -from kiloeyes.openstack.common import log from kiloeyes import tests -import json -import mock -import requests - LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/microservice/test_metrics_fixer.py b/kiloeyes/tests/microservice/test_metrics_fixer.py index b379a62..5fce241 100755 --- a/kiloeyes/tests/microservice/test_metrics_fixer.py +++ b/kiloeyes/tests/microservice/test_metrics_fixer.py @@ -13,11 +13,11 @@ # under the License. import json +from oslo_log import log import time from kiloeyes.microservice import metrics_fixer -from kiloeyes.openstack.common import log from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/microservice/test_notification_processor.py b/kiloeyes/tests/microservice/test_notification_processor.py index ce33a81..69d954a 100755 --- a/kiloeyes/tests/microservice/test_notification_processor.py +++ b/kiloeyes/tests/microservice/test_notification_processor.py @@ -15,10 +15,10 @@ import ast import json import mock +from oslo_log import log from kiloeyes.common import email_sender from kiloeyes.microservice import notification_processor -from kiloeyes.openstack.common import log from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/microservice/test_strategy.py b/kiloeyes/tests/microservice/test_strategy.py index 04064d3..e88657d 100755 --- a/kiloeyes/tests/microservice/test_strategy.py +++ b/kiloeyes/tests/microservice/test_strategy.py @@ -13,11 +13,11 @@ # under the License. import dateutil.parser as dparser +from oslo_log import log import time from kiloeyes.microservice import timed_strategy from kiloeyes.openstack.common.fixture import config -from kiloeyes.openstack.common import log from kiloeyes import tests LOG = log.getLogger(__name__) diff --git a/kiloeyes/tests/microservice/test_threshold_processor.py b/kiloeyes/tests/microservice/test_threshold_processor.py index 74010b9..bf94c24 100755 --- a/kiloeyes/tests/microservice/test_threshold_processor.py +++ b/kiloeyes/tests/microservice/test_threshold_processor.py @@ -16,9 +16,9 @@ import json import mock import os +from oslo_log import log from kiloeyes.microservice import threshold_processor as processor -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import timeutils as tu from kiloeyes import tests diff --git a/kiloeyes/v2/elasticsearch/alarmdefinitions.py b/kiloeyes/v2/elasticsearch/alarmdefinitions.py index f15f034..0f5c56f 100755 --- a/kiloeyes/v2/elasticsearch/alarmdefinitions.py +++ b/kiloeyes/v2/elasticsearch/alarmdefinitions.py @@ -24,7 +24,7 @@ from kiloeyes.common import alarm_expr_validator from kiloeyes.common import es_conn from kiloeyes.common import namespace from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log try: diff --git a/kiloeyes/v2/elasticsearch/alarms.py b/kiloeyes/v2/elasticsearch/alarms.py index 294cb29..f961786 100755 --- a/kiloeyes/v2/elasticsearch/alarms.py +++ b/kiloeyes/v2/elasticsearch/alarms.py @@ -21,7 +21,7 @@ from stevedore import driver from kiloeyes.common import es_conn from kiloeyes.common import namespace from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log try: diff --git a/kiloeyes/v2/elasticsearch/metrics.py b/kiloeyes/v2/elasticsearch/metrics.py index 406098c..00d3932 100755 --- a/kiloeyes/v2/elasticsearch/metrics.py +++ b/kiloeyes/v2/elasticsearch/metrics.py @@ -17,6 +17,7 @@ import datetime import dateutil.parser import falcon from oslo_config import cfg +from oslo_log import log import requests from stevedore import driver @@ -24,7 +25,6 @@ from kiloeyes.common import es_conn from kiloeyes.common import kafka_conn from kiloeyes.common import namespace from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log from kiloeyes.openstack.common import timeutils as tu try: diff --git a/kiloeyes/v2/elasticsearch/notificationmethods.py b/kiloeyes/v2/elasticsearch/notificationmethods.py index 7e58af8..2be87ca 100755 --- a/kiloeyes/v2/elasticsearch/notificationmethods.py +++ b/kiloeyes/v2/elasticsearch/notificationmethods.py @@ -23,7 +23,7 @@ import uuid from kiloeyes.common import es_conn from kiloeyes.common import namespace from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log NOTIFICATION_METHOD_OPTS = [ diff --git a/kiloeyes/v2/elasticsearch/versions.py b/kiloeyes/v2/elasticsearch/versions.py index 0720045..a5ce23c 100755 --- a/kiloeyes/v2/elasticsearch/versions.py +++ b/kiloeyes/v2/elasticsearch/versions.py @@ -16,7 +16,7 @@ import datetime import falcon from kiloeyes.common import resource_api -from kiloeyes.openstack.common import log +from oslo_log import log try: import ujson as json diff --git a/requirements.txt b/requirements.txt index 72a44b4..918fd61 100755 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,8 @@ gunicorn>=19.1.0,<=19.2.1 iso8601>=0.1.9 kafka-python>=0.8.1 oslo.config>=1.11.0 +oslo.log>=1.0.0 +oslo.service>=0.1.0 pastedeploy>=1.3.3 pbr>=0.6,!=0.7,<1.0 python-dateutil>=1.5