summaryrefslogtreecommitdiff
path: root/trove/common/utils.py
diff options
context:
space:
mode:
authorSergey Vilgelm <sergey@vilgelm.info>2015-07-20 22:28:11 +0300
committerSergey Vilgelm <sergey@vilgelm.info>2015-07-23 19:31:58 +0300
commit19862628e43296686344a1dff5db495638a1a995 (patch)
tree02219b63cfcb2a9c8a890108d4db317ebc111a70 /trove/common/utils.py
parenteed54dbf0cc2c1e65617d4047e7e41bcdf1fc855 (diff)
downloadtrove-19862628e43296686344a1dff5db495638a1a995.tar.gz
Switch to the oslo_log library
Remove the log module of oslo-incubator. Move the WritableLogger wrapper to the base_wsgi module. Add oslo.log to the requirements. Change-Id: I724fa6090cebf40e7d7c78cc6b8458dfba9508a8
Diffstat (limited to 'trove/common/utils.py')
-rw-r--r--trove/common/utils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/trove/common/utils.py b/trove/common/utils.py
index 285f4447..0c9f9aec 100644
--- a/trove/common/utils.py
+++ b/trove/common/utils.py
@@ -26,6 +26,7 @@ import uuid
from eventlet.timeout import Timeout
import jinja2
from oslo_concurrency import processutils
+from oslo_log import log as logging
from oslo_service import loopingcall
from oslo_utils import importutils
from oslo_utils import strutils
@@ -36,7 +37,6 @@ import six.moves.urllib.parse as urlparse
from trove.common import cfg
from trove.common import exception
from trove.common.i18n import _
-from trove.openstack.common import log as logging
CONF = cfg.CONF
@@ -48,7 +48,6 @@ bool_from_string = strutils.bool_from_string
execute = processutils.execute
isotime = timeutils.isotime
-CONF = cfg.CONF
ENV = jinja2.Environment(loader=jinja2.ChoiceLoader([
jinja2.FileSystemLoader(CONF.template_path),
jinja2.PackageLoader("trove", "templates")