From 8a0774d298df88d167c8fd25f68ac0eab72068b8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 21 Aug 2012 15:56:08 -0400 Subject: [PATCH 1/2] cc-4240: Added more tracebacks --- python_apps/pypo/recorder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index e4c1e85f7..4afb76e86 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -157,7 +157,6 @@ class ShowRecorder(Thread): recorded_file.save() except Exception, e: - import traceback top = traceback.format_exc() self.logger.error('Exception: %s', e) self.logger.error("traceback: %s", top) @@ -308,6 +307,7 @@ class Recorder(Thread): self.process_recorder_schedule(temp) self.logger.info("updated recorder schedule received: %s", temp) except Exception, e: + self.logger.error( traceback.format_exc() ) self.logger.error(e) try: self.handle_message() except Exception, e: @@ -316,7 +316,6 @@ class Recorder(Thread): time.sleep(PUSH_INTERVAL) self.loops += 1 except Exception, e : - import traceback top = traceback.format_exc() self.logger.error('Exception: %s', e) self.logger.error("traceback: %s", top) From 64a36ea21aba2e7411a805254f53e6b8dc3ee791 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 21 Aug 2012 16:33:37 -0400 Subject: [PATCH 2/2] cc-4240: fixed --- airtime_mvc/application/models/Show.php | 2 +- python_apps/pypo/recorder.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 874fe2402..8cca2cf69 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1549,7 +1549,7 @@ class Application_Model_Show $sql = $sql." AND ({$exclude})"; } - $result = $con->query($sql); + $result = $con->query($sql)->fetchAll(); return $result; } diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index 4afb76e86..d123b42ef 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -286,6 +286,7 @@ class Recorder(Thread): self.process_recorder_schedule(temp) self.logger.info("Bootstrap recorder schedule received: %s", temp) except Exception, e: + self.logger.error( traceback.format_exc() ) self.logger.error(e) self.logger.info("Bootstrap complete: got initial copy of the schedule")