From 8a6b84fe27dd610ecd2f19e4b553b0460ba860e7 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Mon, 24 Mar 2008 09:44:44 +0000
Subject: [PATCH] make doc test run again - keep base.schedule.Scheduler

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2470 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 agent/__init__.py      |  5 ++---
 agent/base/agent.py    |  5 -----
 agent/base/control.py  |  2 --
 agent/base/job.py      |  4 +---
 agent/base/schedule.py |  1 -
 agent/core/schedule.py | 14 +++-----------
 6 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/agent/__init__.py b/agent/__init__.py
index 7b437e7..13a3d13 100644
--- a/agent/__init__.py
+++ b/agent/__init__.py
@@ -4,6 +4,5 @@ $Id$
 
 # register default adapters
 
-#from cybertools.agent.base import agent, control, job, log, schedule
-from cybertools.agent.base import agent, control, job, log
-from cybertools.agent.core import schedule
\ No newline at end of file
+from cybertools.agent.base import agent, control, job, log, schedule
+from cybertools.agent.core import schedule
diff --git a/agent/base/agent.py b/agent/base/agent.py
index 4bc1bb6..92b2723 100644
--- a/agent/base/agent.py
+++ b/agent/base/agent.py
@@ -84,9 +84,6 @@ class Master(Agent):
 
 class SampleAgent(Agent):
 
-    def __init__(self, parent):
-        self.parent = parent
-
     def execute(self, job, params=None):
         print 'Job %s on agent %s has been executed.' % (job.identifier, self.name)
         self.log(job)
@@ -95,6 +92,4 @@ class SampleAgent(Agent):
         self.logger.log(dict(message='job execution', job=job.identifier,
                         agent=self.name))
 
-
 agents.register(SampleAgent, Master, name='sample')
-
diff --git a/agent/base/control.py b/agent/base/control.py
index 01d9281..726d019 100644
--- a/agent/base/control.py
+++ b/agent/base/control.py
@@ -48,7 +48,6 @@ class Controller(object):
 
 
 class SampleController(Controller):
-    
 
     def _getAgents(self):
         return [AgentSpecification('sample01', 'sample')]
@@ -66,7 +65,6 @@ class AgentSpecification(object):
 
 
 class JobSpecification(object):
-    
 
     startTime = None
 
diff --git a/agent/base/job.py b/agent/base/job.py
index 64c130c..3b1ce35 100644
--- a/agent/base/job.py
+++ b/agent/base/job.py
@@ -24,8 +24,7 @@ $Id$
 
 from zope.interface import implements
 
-#from cybertools.agent.base.schedule import Scheduler
-from cybertools.agent.core.schedule import Scheduler
+from cybertools.agent.base.schedule import Scheduler
 from cybertools.agent.components import jobs
 from cybertools.agent.interfaces import IScheduledJob
 
@@ -60,4 +59,3 @@ class Job(object):
         newJob.successors = [s.copy() for s in self.successors]
 
 jobs.register(Job, Scheduler, name='sample')
-#jobs.register(Job, Scheduler, name='BasicCrawler')
diff --git a/agent/base/schedule.py b/agent/base/schedule.py
index 8b7ac04..12411e8 100644
--- a/agent/base/schedule.py
+++ b/agent/base/schedule.py
@@ -48,4 +48,3 @@ class Scheduler(object):
 
 
 schedulers.register(Scheduler, Master, name='sample')
-#schedulers.register(Scheduler, Master, name='BasicCrawler')
diff --git a/agent/core/schedule.py b/agent/core/schedule.py
index 77132fc..da52b7b 100644
--- a/agent/core/schedule.py
+++ b/agent/core/schedule.py
@@ -19,7 +19,7 @@
 """
 Basic (sample) job scheduler.
 
-$Id: schedule.py 2415 2008-02-24 15:04:13Z helmutm $
+$Id$
 """
 
 from time import time
@@ -47,24 +47,16 @@ class Scheduler(object):
         self.queue.append(job)
         if startTime is None:
             startTime = int(time())
-            
-        if startTime < int(time()):
-            '''
-            Only small test for first draft
-            '''
-            startTime = startTime + int(time())
         job.startTime = startTime
         job.scheduler = self
         #while startTime in self.queue:
         #    startTime += 1
         #self.queue[startTime] = job
-        #reactor.callLater(startTime-int(time()), job.execute)
+        reactor.callLater(startTime-int(time()), job.execute)
         job.execute()
         return startTime
 
     def getJobsToExecute(startTime=0):
         return [j for j in self.queue.values() if startTime <= j.startTime]
 
-
-schedulers.register(Scheduler, Master, name='sample')
-#schedulers.register(Scheduler, Master, name='BasicCrawler')
+schedulers.register(Scheduler, Master, name='core')