CC-2419: Media monitor does not import files that already existed in /srv/airtime/stor
-problem where media-monitor froze on startup if rabbitmq wasn't running is fixed (now consistent with pypo)
This commit is contained in:
parent
0a78605633
commit
10c7c0b5fd
1 changed files with 20 additions and 7 deletions
|
@ -27,13 +27,26 @@ class AirtimeNotifier(Notifier):
|
||||||
self.import_processes = {}
|
self.import_processes = {}
|
||||||
self.watched_folders = []
|
self.watched_folders = []
|
||||||
|
|
||||||
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
|
while not self.init_rabbit_mq():
|
||||||
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
|
logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
|
||||||
self.connection = BrokerConnection(self.config.cfg["rabbitmq_host"], self.config.cfg["rabbitmq_user"], self.config.cfg["rabbitmq_password"], "/")
|
time.sleep(5)
|
||||||
channel = self.connection.channel()
|
|
||||||
consumer = Consumer(channel, schedule_queue)
|
def init_rabbit_mq(self):
|
||||||
consumer.register_callback(self.handle_message)
|
logger = logging.getLogger('fetch')
|
||||||
consumer.consume()
|
logger.info("Initializing RabbitMQ stuff")
|
||||||
|
try:
|
||||||
|
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
|
||||||
|
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
|
||||||
|
self.connection = BrokerConnection(self.config.cfg["rabbitmq_host"], self.config.cfg["rabbitmq_user"], self.config.cfg["rabbitmq_password"], "/")
|
||||||
|
channel = self.connection.channel()
|
||||||
|
consumer = Consumer(channel, schedule_queue)
|
||||||
|
consumer.register_callback(self.handle_message)
|
||||||
|
consumer.consume()
|
||||||
|
except Exception, e:
|
||||||
|
logger.error(e)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
def handle_message(self, body, message):
|
def handle_message(self, body, message):
|
||||||
# ACK the message to take it off the queue
|
# ACK the message to take it off the queue
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue