From c1dd059fa76d5ad89f6e10882bce99aa8b4c8e73 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Mon, 11 Jun 2012 14:29:08 -0500
Subject: [PATCH] improved scheduler behaviour, thanks Michael

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

diff --git a/VERSION b/VERSION
index 4572c59a..a1b4b59e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-10 21:17:42) dev
+Version 2.00.0 (2012-06-11 14:29:03) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 49b94121..205d39c5 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -361,7 +361,7 @@ class Scheduler(MetaScheduler):
             Field('enabled','boolean',default=True),
             Field('start_time','datetime',default=now),
             Field('next_run_time','datetime',default=now),
-            Field('stop_time','datetime',default=now+datetime.timedelta(days=1)),
+            Field('stop_time','datetime',default=None),
             Field('repeats','integer',default=1,comment="0=unlimted"),
             Field('period','integer',default=60,comment='seconds'),
             Field('timeout','integer',default=60,comment='seconds'),
@@ -542,7 +542,7 @@ class Scheduler(MetaScheduler):
         all_available = db(ts.status.belongs((QUEUED,ASSIGNED)))\
                 ((ts.times_run<ts.repeats)|(ts.repeats==0))\
                 (ts.start_time<=now)\
-                (ts.stop_time>now)\
+                ((ts.stop_time==None) | (ts.stop_time>now))\
                 (ts.next_run_time<=now)\
                 (ts.enabled==True)\
                 (ts.group_name.belongs(self.group_names)) #\