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

Merge branch '2.3.x' 

Conflicts:
	python_apps/pypo/pypofetch.py
This commit is contained in:
Martin Konecny 2013-04-05 17:33:02 -04:00
parent 18574fd10f 3d135a9f4a
commit db5d2283f4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python_apps/pypo/pypofetch.py
View File

@ -10,6 +10,7 @@ import copy
import subprocess import subprocess
import signal import signal
from datetime import datetime from datetime import datetime
import traceback
from Queue import Empty from Queue import Empty
from threading import Thread from threading import Thread
@ -124,7 +125,6 @@ class PypoFetch(Thread):
self.listener_timeout = 0 self.listener_timeout = 0
self.logger.info("New timeout: %s" % self.listener_timeout) self.logger.info("New timeout: %s" % self.listener_timeout)
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)
@ -547,8 +547,12 @@ class PypoFetch(Thread):
#being incorrect!) #being incorrect!)
if not self.is_file_opened(path): if not self.is_file_opened(path):
os.remove(path) os.remove(path)
self.logger.info("File '%s' removed" % path)
else:
self.logger.info("File '%s' not removed. Still busy!" % path)
except Exception, e: except Exception, e:
self.logger.error(e) self.logger.error("Problem removing file '%s'" % f)
self.logger.error(traceback.format_exc())
def manual_schedule_fetch(self): def manual_schedule_fetch(self):
success, self.schedule_data = self.api_client.get_schedule() success, self.schedule_data = self.api_client.get_schedule()
@ -599,7 +603,6 @@ class PypoFetch(Thread):
self.logger.info("Queue timeout. Fetching schedule manually") self.logger.info("Queue timeout. Fetching schedule manually")
self.persistent_manual_schedule_fetch(max_attempts=5) self.persistent_manual_schedule_fetch(max_attempts=5)
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)