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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-08-21 16:37:41 -04:00
parent ffbdba6f6b 64a36ea21a
commit 316afaf2a1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Show.php
View File

@ -1549,7 +1549,7 @@ class Application_Model_Show
$sql = $sql." AND ({$exclude})"; $sql = $sql." AND ({$exclude})";
} }
$result = $con->query($sql); $result = $con->query($sql)->fetchAll();
return $result; return $result;
} }

4
python_apps/pypo/recorder.py
View File

@ -157,7 +157,6 @@ class ShowRecorder(Thread):
recorded_file.save() recorded_file.save()
except Exception, e: except Exception, e:
import traceback
top = traceback.format_exc() top = traceback.format_exc()
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", top) self.logger.error("traceback: %s", top)
@ -287,6 +286,7 @@ class Recorder(Thread):
self.process_recorder_schedule(temp) self.process_recorder_schedule(temp)
self.logger.info("Bootstrap recorder schedule received: %s", temp) self.logger.info("Bootstrap recorder schedule received: %s", temp)
except Exception, e: except Exception, e:
self.logger.error( traceback.format_exc() )
self.logger.error(e) self.logger.error(e)
self.logger.info("Bootstrap complete: got initial copy of the schedule") self.logger.info("Bootstrap complete: got initial copy of the schedule")
@ -308,6 +308,7 @@ class Recorder(Thread):
self.process_recorder_schedule(temp) self.process_recorder_schedule(temp)
self.logger.info("updated recorder schedule received: %s", temp) self.logger.info("updated recorder schedule received: %s", temp)
except Exception, e: except Exception, e:
self.logger.error( traceback.format_exc() )
self.logger.error(e) self.logger.error(e)
try: self.handle_message() try: self.handle_message()
except Exception, e: except Exception, e:
@ -316,7 +317,6 @@ class Recorder(Thread):
time.sleep(PUSH_INTERVAL) time.sleep(PUSH_INTERVAL)
self.loops += 1 self.loops += 1
except Exception, e : except Exception, e :
import traceback
top = traceback.format_exc() top = traceback.format_exc()
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", top) self.logger.error("traceback: %s", top)