x/python-ganttclient
Code Issues Proposed changes

Fix queue connection bugs

Browse Source 
Fix logging if queue disconnects
Reconnect if queue comes back
This commit is contained in:
Vishvananda Ishaya
2010-06-23 23:24:38 -07:00
parent c08fe5604c
commit ba3a711604
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nova/rpc.py
View File

@@ -63,6 +63,10 @@ class Connection(connection.BrokerConnection):
cls._instance = cls(**params) cls._instance = cls(**params)
return cls._instance return cls._instance
@classmethod
def recreate(cls):
del cls._instance
return cls.instance()
class Consumer(messaging.Consumer): class Consumer(messaging.Consumer):
# TODO(termie): it would be nice to give these some way of automatically # TODO(termie): it would be nice to give these some way of automatically
@@ -79,9 +83,20 @@ class Consumer(messaging.Consumer):
attachToTornado = attach_to_tornado attachToTornado = attach_to_tornado
@exception.wrap_exception
def fetch(self, *args, **kwargs): def fetch(self, *args, **kwargs):
try:
if getattr(self, 'failed_connection', False):
# attempt to reconnect
self.conn = Connection.recreate()
self.backend = self.conn.create_backend()
super(Consumer, self).fetch(*args, **kwargs) super(Consumer, self).fetch(*args, **kwargs)
if getattr(self, 'failed_connection', False):
logging.error("Reconnected to queue")
self.failed_connection = False
except Exception, ex:
if not getattr(self, 'failed_connection', False):
logging.exception("Failed to fetch message from queue")
self.failed_connection = True
def attach_to_twisted(self): def attach_to_twisted(self):
loop = task.LoopingCall(self.fetch, enable_callbacks=True) loop = task.LoopingCall(self.fetch, enable_callbacks=True)