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

SAAS-871 - Fix consumer cancellation bug

This commit is contained in:
Duncan Sommerville 2015-06-26 17:11:04 -04:00
parent ca9c805ce4
commit d9f17f3919
1 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
python_apps/pypo/pypo/pypomessagehandler.py
View File

@ -10,7 +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 from amqp.exceptions import AMQPError
import json import json
from std_err_override import LogWriter from std_err_override import LogWriter
@ -29,21 +29,21 @@ class PypoMessageHandler(Thread):
def init_rabbit_mq(self): def init_rabbit_mq(self):
self.logger.info("Initializing RabbitMQ stuff") self.logger.info("Initializing RabbitMQ stuff")
simple_queue = None
try: try:
schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True) schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True)
schedule_queue = Queue("pypo-fetch", exchange=schedule_exchange, key="foo") schedule_queue = Queue("pypo-fetch", exchange=schedule_exchange, key="foo")
connection = BrokerConnection(self.config["host"], \ connection = BrokerConnection(self.config["host"],
self.config["user"], \ self.config["user"],
self.config["password"], \ self.config["password"],
self.config["vhost"]) self.config["vhost"])
channel = connection.channel() channel = connection.channel()
self.simple_queue = SimpleQueue(channel, schedule_queue) simple_queue = SimpleQueue(channel, schedule_queue)
except Exception, e: except Exception, e:
self.logger.error(e) self.logger.error(e)
return False
return True return simple_queue
""" """
Handle a message from RabbitMQ, put it into our yucky global var. Handle a message from RabbitMQ, put it into our yucky global var.
@ -91,39 +91,18 @@ class PypoMessageHandler(Thread):
self.logger.error("Exception in handling RabbitMQ message: %s", e) self.logger.error("Exception in handling RabbitMQ message: %s", e)
def main(self): def main(self):
while not self.init_rabbit_mq(): try:
self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds") with self.init_rabbit_mq() as queue:
time.sleep(5) while True:
message = queue.get(block=True)
loops = 1 self.handle_message(message.payload)
while True: # ACK the message to take it off the queue
self.logger.info("Loop #%s", loops) message.ack()
try: except Exception, e:
message = self.simple_queue.get(block=True) self.logger.error('Exception: %s', e)
self.handle_message(message.payload) self.logger.error("traceback: %s", traceback.format_exc())
# ACK the message to take it off the queue self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
message.ack() time.sleep(5)
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():
self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
time.sleep(5)
except Exception, e:
"""
sleep 5 seconds so that we don't spin inside this
while loop and eat all the CPU
"""
time.sleep(5)
"""
There is a problem with the RabbitMq messenger service. Let's
log the error and get the schedule via HTTP polling
"""
self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", traceback.format_exc())
loops += 1
""" """
Main loop of the thread: Main loop of the thread: