summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-08-26 16:00:50 -0700
committerChris Behrens <cbehrens@codestud.com>2011-08-26 16:00:50 -0700
commit1c5031ca6f89de4ac8a7dac271aff9942fc9602a (patch)
treed1cfe9c3bc8773d2968379cac5aae599a9b59584
parent9cb46c48682657039173447f9689e15ed3ce15af (diff)
downloadnova-1c5031ca6f89de4ac8a7dac271aff9942fc9602a.tar.gz
nova-1c5031ca6f89de4ac8a7dac271aff9942fc9602a.tar.xz
nova-1c5031ca6f89de4ac8a7dac271aff9942fc9602a.zip
more fixes
-rw-r--r--nova/rpc/impl_kombu.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index a222bb885..cfef421c6 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -15,7 +15,7 @@
# under the License.
from nova import flags
-from nova import log as logging
+from nova.rpc.common import RemoteError, LOG
import kombu
import kombu.entity
@@ -28,7 +28,6 @@ import uuid
FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.rpc')
flags.DEFINE_integer('rpc_conn_pool_size', 30,
'Size of RPC connection pool')
@@ -559,7 +558,7 @@ class ProxyCallback(object):
# This final None tells multicall that it is done.
ctxt.reply(None, None)
except Exception as e:
- logging.exception('Exception during message handling')
+ LOG.exception('Exception during message handling')
ctxt.reply(None, sys.exc_info())
return