summaryrefslogtreecommitdiffstats
path: root/nova/rpc.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/rpc.py')
-rw-r--r--nova/rpc.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/rpc.py b/nova/rpc.py
index 6a634a4ec..b5df4904b 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -237,7 +237,9 @@ class DirectPublisher(Publisher):
def msg_reply(msg_id, reply=None, failure=None):
"""Sends a reply or an error on the channel signified by msg_id
- failure should be a twisted failure object"""
+ failure should be a sys.exc_info() tuple.
+
+ """
if failure:
message = str(failure[1])
tb = traceback.format_exception(*failure)
@@ -332,7 +334,7 @@ def call(context, topic, msg):
pass
consumer.close()
# NOTE(termie): this is a little bit of a change from the original
- # twisted-based code where returning a Failure
+ # non-eventlet code where returning a Failure
# instance from a deferred call is very similar to
# raising an exception
if isinstance(wait_msg.result, Exception):