diff --git a/python_apps/media-monitor2/media/monitor/eventdrainer.py b/python_apps/media-monitor2/media/monitor/eventdrainer.py index 4a7316c5e..b551fae8e 100644 --- a/python_apps/media-monitor2/media/monitor/eventdrainer.py +++ b/python_apps/media-monitor2/media/monitor/eventdrainer.py @@ -2,6 +2,7 @@ import socket import time from media.monitor.log import Loggable from media.monitor.toucher import RepeatTimer +from amqplib.client_0_8.exceptions import AMQPConnectionException class EventDrainer(Loggable): """ @@ -14,7 +15,7 @@ class EventDrainer(Loggable): message = airtime_notifier.simple_queue.get(block=True) airtime_notifier.handle_message(message.payload) message.ack() - except (IOError, AttributeError), e: + except (IOError, AttributeError, AMQPConnectionException), e: self.logger.error('Exception: %s', e) while not airtime_notifier.init_rabbit_mq(): self.logger.error("Error connecting to RabbitMQ Server. \ diff --git a/python_apps/pypo/pypomessagehandler.py b/python_apps/pypo/pypomessagehandler.py index 711c66575..427772c19 100644 --- a/python_apps/pypo/pypomessagehandler.py +++ b/python_apps/pypo/pypomessagehandler.py @@ -10,6 +10,7 @@ import time from kombu.connection import BrokerConnection from kombu.messaging import Exchange, Queue from kombu.simple import SimpleQueue +from amqplib.client_0_8.exceptions import AMQPConnectionException import json from std_err_override import LogWriter @@ -112,7 +113,7 @@ class PypoMessageHandler(Thread): self.handle_message(message.payload) # ACK the message to take it off the queue message.ack() - except (IOError, AttributeError), e: + except (IOError, AttributeError, AMQPConnectionException), e: self.logger.error('Exception: %s', e) self.logger.error("traceback: %s", traceback.format_exc()) while not self.init_rabbit_mq():