diff --git a/VERSION b/VERSION index 410191a1..8e24ad95 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-11-04 20:45:19) stable +Version 2.2.1 (2012-11-05 12:39:09) stable diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 7b441749..b33a10ba 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -739,6 +739,8 @@ class Scheduler(MetaScheduler): db(sw.worker_name == self.worker_name).update( last_heartbeat=now, status=ACTIVE) self.worker_status[1] = 1 # re-activating the process + if self.worker_status[0] <> RUNNING: + self.worker_status[0] = ACTIVE self.do_assign_tasks = False