From 33b6c2a3900b922641951f8be44ab76b2ff20500 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 27 Feb 2012 18:09:07 -0500 Subject: [PATCH] CC-3346: Recorder: Merge recorder with pypo - fixed log message --- python_apps/pypo/pypofetch.py | 4 ++-- python_apps/pypo/recorder.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 4a4bc59ca..6e58cc287 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -54,7 +54,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'] @@ -80,7 +80,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') diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index a4052c485..cd57617d9 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -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()