From 8675b833edd9421dd07fb4bb9b886a51097d54f2 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 6 Aug 2012 13:40:03 -0500
Subject: [PATCH] scheduler uses pid to id running tasks, thanks Niphlod

---
 VERSION            | 2 +-
 gluon/scheduler.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index cc5e6a68..2111adef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-06 10:56:27) dev
+Version 2.00.0 (2012-08-06 13:39:52) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 1e4f9fff..29ff3948 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -360,7 +360,7 @@ class Scheduler(MetaScheduler):
         self.tasks = tasks
         self.group_names = group_names or ['main']
         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
                                         #the table, plus a boost parameter for
                                         #hibernation (i.e. when someone stop the
@@ -403,7 +403,7 @@ class Scheduler(MetaScheduler):
             Field('start_time','datetime',default=now),
             Field('next_run_time','datetime',default=now),
             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('period','integer',default=60,comment='seconds'),
             Field('timeout','integer',default=60,comment='seconds'),
@@ -497,7 +497,7 @@ class Scheduler(MetaScheduler):
             return None
         next_run_time = task.last_run_time + datetime.timedelta(seconds=task.period)
         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
         else:
             run_again = False
@@ -676,7 +676,7 @@ class Scheduler(MetaScheduler):
         db(ts.status.belongs((QUEUED,ASSIGNED)))(ts.stop_time<now).update(status=EXPIRED)
 
         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.stop_time==None) | (ts.stop_time>now))\
                 (ts.next_run_time<=now)\