Merge branch 'loop' into combined

nova/rpc.py

@@ -18,18 +18,19 @@ AMQP-based RPC. Queues have consumers and publishers.
 No fan-out support yet.
 """
 
+import json
 import logging
 import sys
 import uuid
 
 from nova import vendor
-import anyjson
 from carrot import connection
 from carrot import messaging
 from twisted.internet import defer
 from twisted.internet import reactor
 from twisted.internet import task
 
+from nova import exception
 from nova import fakerabbit
 from nova import flags
 
@@ -73,9 +74,13 @@ class Consumer(messaging.Consumer):
 
     attachToTornado = attach_to_tornado
 
+    @exception.wrap_exception
+    def fetch(self, *args, **kwargs):
+        super(Consumer, self).fetch(*args, **kwargs)
+
     def attach_to_twisted(self):
         loop = task.LoopingCall(self.fetch, enable_callbacks=True)
-        loop.start(interval=0.001)
+        loop.start(interval=0.01)
 
 class Publisher(messaging.Publisher):
     pass
@@ -96,13 +101,20 @@ class AdapterConsumer(TopicConsumer):
         self.proxy = proxy
         super(AdapterConsumer, self).__init__(connection=connection, topic=topic)
 
+    @exception.wrap_exception
     def receive(self, message_data, message):
         _log.debug('received %s' % (message_data))
         msg_id = message_data.pop('_msg_id', None)
 
         method = message_data.get('method')
         args = message_data.get('args', {})
+        message.ack()
         if not method:
+            # vish: we may not want to ack here, but that means that bad messages
+            #       stay in the queue indefinitely, so for now we just log the
+            #       message and send an error string back to the caller
+            _log.warn('no method for message: %s' % (message_data))
+            msg_reply(msg_id, 'No method for message: %s' % message_data)
             return
 
         node_func = getattr(self.proxy, str(method))
@@ -111,7 +123,6 @@ class AdapterConsumer(TopicConsumer):
         if msg_id:
             d.addCallback(lambda rval: msg_reply(msg_id, rval))
             d.addErrback(lambda e: msg_reply(msg_id, str(e)))
-        message.ack()
         return
 
 
@@ -198,7 +209,7 @@ def send_message(topic, message, wait=True):
     _log.debug('message %s', message)
 
     if wait:
-        consumer = messaging.Consumer(connection=rpc.Connection.instance(),
+        consumer = messaging.Consumer(connection=Connection.instance(),
                                       queue=msg_id,
                                       exchange=msg_id,
                                       auto_delete=True,
@@ -206,7 +217,7 @@ def send_message(topic, message, wait=True):
                                       routing_key=msg_id)
         consumer.register_callback(generic_response)
 
-    publisher = messaging.Publisher(connection=rpc.Connection.instance(),
+    publisher = messaging.Publisher(connection=Connection.instance(),
                                     exchange="nova",
                                     exchange_type="topic",
                                     routing_key=topic)
@@ -219,4 +230,4 @@ def send_message(topic, message, wait=True):
 
 # TODO: Replace with a docstring test
 if __name__ == "__main__":
-    send_message(sys.argv[1], anyjson.deserialize(sys.argv[2]))
+    send_message(sys.argv[1], json.loads(sys.argv[2]))