diff options
| author | Andy Smith <code@term.ie> | 2010-12-09 16:05:13 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2010-12-09 16:05:13 -0800 |
| commit | a1640f352806ee12f6b485a8d69a65bd42b51411 (patch) | |
| tree | 710eb3848e798cf6af99609ce3f4e7770ed1db28 /nova/rpc.py | |
| parent | b3f5aba0c465b263c1d0a15c7d249dafb3a98e6c (diff) | |
| download | nova-a1640f352806ee12f6b485a8d69a65bd42b51411.tar.gz nova-a1640f352806ee12f6b485a8d69a65bd42b51411.tar.xz nova-a1640f352806ee12f6b485a8d69a65bd42b51411.zip | |
formatting and naming cleanup
Diffstat (limited to 'nova/rpc.py')
| -rw-r--r-- | nova/rpc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/rpc.py b/nova/rpc.py index 652b9e4aa..6a634a4ec 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -309,7 +309,6 @@ def call(context, topic, msg): class WaitMessage(object): def __call__(self, data, message): - LOG.debug('data %s, msg %s', data, message) """Acks message and sets result.""" message.ack() if data['failure']: @@ -332,6 +331,10 @@ def call(context, topic, msg): except StopIteration: pass consumer.close() + # NOTE(termie): this is a little bit of a change from the original + # twisted-based code where returning a Failure + # instance from a deferred call is very similar to + # raising an exception if isinstance(wait_msg.result, Exception): raise wait_msg.result return wait_msg.result |