Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4915: Media-Monitor cannot handle rabbitmq restart event

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2013-03-01 16:05:55 -05:00
parent 764ee0389f
commit 259f70bc21
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/media-monitor2/media/monitor/eventdrainer.py
View file

@ -2,6 +2,7 @@ import socket
import time import time
from media.monitor.log import Loggable from media.monitor.log import Loggable
from media.monitor.toucher import RepeatTimer from media.monitor.toucher import RepeatTimer
from amqplib.client_0_8.exceptions import AMQPConnectionException
class EventDrainer(Loggable): class EventDrainer(Loggable):
""" """
@ -14,7 +15,7 @@ class EventDrainer(Loggable):
message = airtime_notifier.simple_queue.get(block=True) message = airtime_notifier.simple_queue.get(block=True)
airtime_notifier.handle_message(message.payload) airtime_notifier.handle_message(message.payload)
message.ack() message.ack()
except (IOError, AttributeError), e: except (IOError, AttributeError, AMQPConnectionException), e:
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)
while not airtime_notifier.init_rabbit_mq(): while not airtime_notifier.init_rabbit_mq():
self.logger.error("Error connecting to RabbitMQ Server. \ self.logger.error("Error connecting to RabbitMQ Server. \

3
python_apps/pypo/pypomessagehandler.py
View file

@ -10,6 +10,7 @@ import time
from kombu.connection import BrokerConnection from kombu.connection import BrokerConnection
from kombu.messaging import Exchange, Queue from kombu.messaging import Exchange, Queue
from kombu.simple import SimpleQueue from kombu.simple import SimpleQueue
from amqplib.client_0_8.exceptions import AMQPConnectionException
import json import json
from std_err_override import LogWriter from std_err_override import LogWriter
@ -112,7 +113,7 @@ class PypoMessageHandler(Thread):
self.handle_message(message.payload) self.handle_message(message.payload)
# ACK the message to take it off the queue # ACK the message to take it off the queue
message.ack() message.ack()
except (IOError, AttributeError), e: except (IOError, AttributeError, AMQPConnectionException), e:
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", traceback.format_exc()) self.logger.error("traceback: %s", traceback.format_exc())
while not self.init_rabbit_mq(): while not self.init_rabbit_mq():