cylc#119: implement feedback

benfitzpatrick · Jul 8, 2014 · 942ae1f · 942ae1f
1 parent 131385c
commit 942ae1f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/doc/suiterc.tex b/doc/suiterc.tex
@@ -808,7 +808,7 @@ \subsection{[scheduling]}
    ColdFoo | foo[-PT6H] => foo # cold-start or restart for foo
    X:start => Y                # Y triggers if X starts executing
    X:fail => Y                 # Y triggers if X fails
-   foo[-PT6H]:fail => bar        # bar triggers if foo[T-6] fails
+   foo[-PT6H]:fail => bar        # bar triggers if foo[-PT6H] fails
    X => !Y                     # Y suicides if X succeeds
    X | X:fail => Z             # Z triggers if X succeeds or fails
    X:finish => Z               # Z triggers if X succeeds or fails

diff --git a/lib/cylc/scheduler.py b/lib/cylc/scheduler.py
@@ -719,25 +719,21 @@ def configure_suite( self, reconfigure=False ):
 
             self.event_queue = Queue()
             task.task.event_queue = self.event_queue
-            delay = self.config.cfg['cylc']['event handler submission'][
-                'delay between batches']
             self.eventq_worker = event_batcher(
-                'Event Handlers', self.event_queue,
-                self.config.cfg['cylc']['event handler submission'][
-                    'batch size'],
-                delay, self.suite
+                    'Event Handlers', self.event_queue,
+                    self.config.cfg['cylc']['event handler submission']['batch size'],
+                    self.config.cfg['cylc']['event handler submission']['delay between batches'],
+                    self.suite
             )
             self.eventq_worker.start()
 
             self.poll_and_kill_queue = Queue()
             task.task.poll_and_kill_queue = self.poll_and_kill_queue
-            delay = self.config.cfg['cylc']['poll and kill command submission'][
-                'delay between batches']
             self.pollkq_worker = poll_and_kill_batcher(
                 'Poll & Kill Commands', self.poll_and_kill_queue,
-                self.config.cfg['cylc']['poll and kill command submission'][
-                    'batch size'],
-                delay, self.suite
+                self.config.cfg['cylc']['poll and kill command submission']['batch size'],
+                self.config.cfg['cylc']['poll and kill command submission']['delay between batches'],
+                self.suite
             )
             self.pollkq_worker.start()
 

diff --git a/lib/cylc/task_pool.py b/lib/cylc/task_pool.py
@@ -81,9 +81,9 @@ def __init__( self, suite, db, stop_point, config, pyro, log, run_mode ):
 
         self.jobqueue = Queue.Queue()
 
-        self.worker = task_batcher('Job Submission', self.jobqueue,
+        self.worker = task_batcher( 'Job Submission', self.jobqueue,
                 config.cfg['cylc']['job submission']['batch size'],
-                config.cfg['cylc']['job submission']['delay between batches']
+                config.cfg['cylc']['job submission']['delay between batches'],
                 self.wireless, self.run_mode )
 
         self.orphans = []