From 05f8ec71c02e563223be8a065adc4688a2246eb0 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date: Sat, 24 Nov 2012 11:13:37 -0500
Subject: Fix common rpc to use common logging instead of python logging

Looks like we just need to fix imports

Fixes Bug #1072633

Change-Id: Iac84ae3aadbe440f9b19e184f080320e4c6cca5f
---
 openstack/common/rpc/amqp.py       | 2 +-
 openstack/common/rpc/common.py     | 2 +-
 openstack/common/rpc/impl_qpid.py  | 2 +-
 openstack/common/rpc/matchmaker.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'openstack')

diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py
index 79eda39..a3e567f 100644
--- a/openstack/common/rpc/amqp.py
+++ b/openstack/common/rpc/amqp.py
@@ -26,7 +26,6 @@ AMQP, but is deprecated and predates this code.
 """
 
 import inspect
-import logging
 import sys
 import uuid
 
@@ -38,6 +37,7 @@ from openstack.common import cfg
 from openstack.common import excutils
 from openstack.common.gettextutils import _
 from openstack.common import local
+from openstack.common import log as logging
 from openstack.common.rpc import common as rpc_common
 
 
diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py
index 58f958f..a95fc66 100644
--- a/openstack/common/rpc/common.py
+++ b/openstack/common/rpc/common.py
@@ -18,13 +18,13 @@
 #    under the License.
 
 import copy
-import logging
 import traceback
 
 from openstack.common.gettextutils import _
 from openstack.common import importutils
 from openstack.common import jsonutils
 from openstack.common import local
+from openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py
index 887a54e..fcf2508 100644
--- a/openstack/common/rpc/impl_qpid.py
+++ b/openstack/common/rpc/impl_qpid.py
@@ -17,7 +17,6 @@
 
 import functools
 import itertools
-import logging
 import time
 import uuid
 
@@ -29,6 +28,7 @@ import qpid.messaging.exceptions
 from openstack.common import cfg
 from openstack.common.gettextutils import _
 from openstack.common import jsonutils
+from openstack.common import log as logging
 from openstack.common.rpc import amqp as rpc_amqp
 from openstack.common.rpc import common as rpc_common
 
diff --git a/openstack/common/rpc/matchmaker.py b/openstack/common/rpc/matchmaker.py
index 2791ac2..8ea78ba 100644
--- a/openstack/common/rpc/matchmaker.py
+++ b/openstack/common/rpc/matchmaker.py
@@ -20,10 +20,10 @@ return keys for direct exchanges, per (approximate) AMQP parlance.
 
 import contextlib
 import itertools
-import json
 import logging
 
 from openstack.common import cfg
+from openstack.common import log as logging
 from openstack.common.gettextutils import _
 
 
-- 
cgit