Author: duncan
Date: Fri Jun 8 18:05:07 2007
New Revision: 9675
Modified:
branches/rel-1/freevo/src/helpers/recordserver.py
Log:
[ 1733192 ] 1.7.[12]:recordserver crashes with empty record_schedule.xml
Fix applied that simply deletes a corrupt record_schedule.xml
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Fri Jun 8 18:05:07 2007
@@ -50,7 +50,7 @@
except Exception, e:
print e
-from twisted.web import xmlrpc, server
+from twisted.web import xmlrpc, server, sux
from twisted.internet.app import Application
from twisted.internet import reactor
from twisted.python import log
@@ -107,6 +107,8 @@
logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+sys.stdout = open(logfile, 'a')
+sys.stderr = sys.stdout
logging.getLogger('').setLevel(LOGGING)
logging.basicConfig(level=LOGGING, \
@@ -251,9 +253,13 @@
_debug_('exception=%r' % e, config.DERROR)
pass
- f = open(config.TV_RECORD_SCHEDULE, 'r')
- scheduledRecordings = unjellyFromXML(f)
- f.close()
+ try:
+ f = open(config.TV_RECORD_SCHEDULE, 'r')
+ scheduledRecordings = unjellyFromXML(f)
+ f.close()
+ except sux.ParseError, e:
+ _debug_('"%s" is invalid, removed' %
(config.TV_RECORD_SCHEDULE), config.DWARNING)
+ os.unlink(config.TV_RECORD_SCHEDULE)
try:
file_ver = scheduledRecordings.TYPES_VERSION
@@ -846,7 +852,7 @@
def checkToRecord(self):
- _debug_('checkToRecord %s' % (time.strftime('%H:%M:%S',
time.localtime(time.time()))), 1)
+ _debug_('checkToRecord %s' % (time.strftime('%H:%M:%S',
time.localtime(time.time()))), 2)
rec_cmd = None
rec_prog = None
cleaned = None
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
