dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scheduler uses pid to id running tasks, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2012-08-06 13:40:03 -05:00
parent 9e5c6cc5be
commit 8675b833ed
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-06 10:56:27) dev Version 2.00.0 (2012-08-06 13:39:52) dev
gluon/scheduler.py
+4 -4
View File
@@ -360,7 +360,7 @@ class Scheduler(MetaScheduler):
self.tasks = tasks self.tasks = tasks
self.group_names = group_names or ['main'] self.group_names = group_names or ['main']
self.heartbeat = heartbeat self.heartbeat = heartbeat
self.worker_name = worker_name or socket.gethostname()+'#'+str(web2py_uuid()) self.worker_name = worker_name or socket.gethostname()+'#'+str(os.getpid())
self.worker_status = RUNNING, 1 #tuple containing status as recorded in self.worker_status = RUNNING, 1 #tuple containing status as recorded in
#the table, plus a boost parameter for #the table, plus a boost parameter for
#hibernation (i.e. when someone stop the #hibernation (i.e. when someone stop the
@@ -403,7 +403,7 @@ class Scheduler(MetaScheduler):
Field('start_time','datetime',default=now), Field('start_time','datetime',default=now),
Field('next_run_time','datetime',default=now), Field('next_run_time','datetime',default=now),
Field('stop_time','datetime'), Field('stop_time','datetime'),
Field('repeat','integer',default=1,comment="0=unlimited"), Field('repeats','integer',default=1,comment="0=unlimited"),
Field('retry_failed', 'integer', default=0, comment="-1=unlimited"), Field('retry_failed', 'integer', default=0, comment="-1=unlimited"),
Field('period','integer',default=60,comment='seconds'), Field('period','integer',default=60,comment='seconds'),
Field('timeout','integer',default=60,comment='seconds'), Field('timeout','integer',default=60,comment='seconds'),
@@ -497,7 +497,7 @@ class Scheduler(MetaScheduler):
return None return None
next_run_time = task.last_run_time + datetime.timedelta(seconds=task.period) next_run_time = task.last_run_time + datetime.timedelta(seconds=task.period)
times_run = task.times_run + 1 times_run = task.times_run + 1
if times_run < task.repeat or task.repeat==0: if times_run < task.repeats or task.repeats==0:
run_again = True run_again = True
else: else:
run_again = False run_again = False
@@ -676,7 +676,7 @@ class Scheduler(MetaScheduler):
db(ts.status.belongs((QUEUED,ASSIGNED)))(ts.stop_time<now).update(status=EXPIRED) db(ts.status.belongs((QUEUED,ASSIGNED)))(ts.stop_time<now).update(status=EXPIRED)
all_available = db(ts.status.belongs((QUEUED,ASSIGNED)))\ all_available = db(ts.status.belongs((QUEUED,ASSIGNED)))\
((ts.times_run<ts.repeat)|(ts.repeat==0))\ ((ts.times_run<ts.repeats)|(ts.repeats==0))\
(ts.start_time<=now)\ (ts.start_time<=now)\
((ts.stop_time==None) | (ts.stop_time>now))\ ((ts.stop_time==None) | (ts.stop_time>now))\
(ts.next_run_time<=now)\ (ts.next_run_time<=now)\