CC-3346: Recorder: Merge recorder with pypo

- fixed log message
This commit is contained in:
James 2012-02-27 18:09:07 -05:00
parent 5aabe89069
commit d4cdac505a
2 changed files with 3 additions and 3 deletions

View File

@ -53,7 +53,7 @@ class PypoFetch(Thread):
def handle_message(self, message):
try:
logger = logging.getLogger('fetch')
logger.info("Received event from RabbitMQ: %s" % message)
logger.info("Received event from Pypo Message Handler: %s" % message)
m = json.loads(message)
command = m['event_type']
@ -79,7 +79,7 @@ class PypoFetch(Thread):
top = traceback.format_exc()
logger.error('Exception: %s', e)
logger.error("traceback: %s", top)
logger.error("Exception in handling RabbitMQ message: %s", e)
logger.error("Exception in handling Message Handler message: %s", e)
def stop_current_show(self):
logger = logging.getLogger('fetch')

View File

@ -183,7 +183,7 @@ class Recorder(Thread):
message = self.queue.get()
msg = json.loads(message)
command = msg["event_type"]
self.logger.info("Received msg from Pypo Fetch: %s", msg)
self.logger.info("Received msg from Pypo Message Handler: %s", msg)
if command == 'cancel_recording':
if self.sr is not None and self.sr.is_recording():
self.sr.cancel_recording()