Rooba
/
rq
mirror of https://github.com/rq/rq.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for python 2.6

This commit is contained in:
Samuel Colvin 2016-06-04 13:31:07 +01:00
parent 18ba4658a4
commit e2f89b3171
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rq/worker.py
View File

@ -730,6 +730,8 @@ class HerokuWorker(Worker):
Note: coverage doesn't work inside the forked thread so code expected to be processed there has pragma: no cover Note: coverage doesn't work inside the forked thread so code expected to be processed there has pragma: no cover
""" """
imminent_shutdown_delay = 8 imminent_shutdown_delay = 8
frame_properties = ['f_code', 'f_exc_traceback', 'f_exc_type', 'f_exc_value', 'f_lasti', 'f_lineno', 'f_locals',
'f_restricted', 'f_trace']
def main_work_horse(self, job, queue): def main_work_horse(self, job, queue):
"""Modified entry point which ignores SIGINT and SIGTERM and only handles SIGRTMIN""" """Modified entry point which ignores SIGINT and SIGTERM and only handles SIGRTMIN"""
@ -786,9 +788,7 @@ class HerokuWorker(Worker):
signal.signal(signal.SIGALRM, self.force_shutdown) signal.signal(signal.SIGALRM, self.force_shutdown)
signal.alarm(self.imminent_shutdown_delay) signal.alarm(self.imminent_shutdown_delay)
@staticmethod def force_shutdown(self, signum, frame):
def force_shutdown(signum, frame): info = dict((attr, getattr(frame, attr)) for attr in self.frame_properties)
info = {attr: getattr(frame, attr) for attr in ['f_code', 'f_exc_traceback', 'f_exc_type', 'f_exc_value',
'f_lasti', 'f_lineno', 'f_locals', 'f_restricted', 'f_trace']}
logger.warn('raising ShutDownImminentException to cancel job...') logger.warn('raising ShutDownImminentException to cancel job...')
raise ShutDownImminentException('shut down imminent (signal: %s)' % signal_name(signum), info) raise ShutDownImminentException('shut down imminent (signal: %s)' % signal_name(signum), info)