Remove cinder.log usage from cinder.rpc.

Part of blueprint common-rpc.

This patch removes the usage of cinder.log from cinder.rpc.  This is
necessary before cinder.rpc can be moved to openstack-common.  The rpc
logging was not using any of the extra features provided in cinder.log as
far as I can tell, so the changes are very simple.

This is the final dependency.  After this change, the rpc code
can be moved to openstack-common without any changes.

Change-Id: I17ca4b691bb8d4f18e618632a2381dd12d31852a

diff --git a/cinder/rpc/amqp.py b/cinder/rpc/amqp.py
index 0e6e5de6d09b0a2a3ade3710c86d4c96f89e99ce..0208fb2e80f901ac3c9b3aef1f99be77a5e45b2c 100644 (file)
--- a/cinder/rpc/amqp.py
+++ b/cinder/rpc/amqp.py
@@ -26,6 +26,7 @@ AMQP, but is deprecated and predates this code.
 """
 
 import inspect
+import logging
 import sys
 import uuid
 
@@ -33,7 +34,6 @@ from eventlet import greenpool
 from eventlet import pools
 from eventlet import semaphore
 
-from cinder import log as logging
 from cinder.openstack.common import local
 import cinder.rpc.common as rpc_common
 from cinder import utils

diff --git a/cinder/rpc/common.py b/cinder/rpc/common.py
index 29db0c4a621c9b2239d81143fa6f476fc96a09da..984a14226a57bd779302cdfb96b6ba9bcf9c456f 100644 (file)
--- a/cinder/rpc/common.py
+++ b/cinder/rpc/common.py
@@ -18,10 +18,10 @@
 #    under the License.
 
 import copy
+import logging
 import sys
 import traceback
 
-from cinder import log as logging
 from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils

diff --git a/cinder/rpc/impl_qpid.py b/cinder/rpc/impl_qpid.py
index 1a8c95bb9dfc9902f03cdfb3baaca99cf3c2d46b..e4db9d99ed694d1847ca56039b192de3ad461c19 100644 (file)
--- a/cinder/rpc/impl_qpid.py
+++ b/cinder/rpc/impl_qpid.py
@@ -16,16 +16,16 @@
 #    under the License.
 
 import itertools
+import json
+import logging
 import time
 import uuid
-import json
 
 import eventlet
 import greenlet
 import qpid.messaging
 import qpid.messaging.exceptions
 
-from cinder import log as logging
 from cinder.openstack.common import cfg
 from cinder.rpc import amqp as rpc_amqp
 from cinder.rpc import common as rpc_common