Merge pull request #11 from event-band/feature/max-execution-time

Change dispatch limit logic
event-band · Aug 28, 2017 · b94fefb · b94fefb
2 parents af87fdc + b2393f1
commit b94fefb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/EventBand/Processor/Control/EventLimiter.php b/src/EventBand/Processor/Control/EventLimiter.php
@@ -8,7 +8,7 @@
  */
 namespace EventBand\Processor\Control;
 
-use EventBand\Processor\DispatchStopEvent;
+use EventBand\Processor\StoppableDispatchEvent;
 
 class EventLimiter
 {
@@ -30,7 +30,7 @@ public function initCounter()
         $this->events = 0;
     }
 
-    public function checkLimit(DispatchStopEvent $event)
+    public function checkLimit(StoppableDispatchEvent $event)
     {
         $this->events++;
 

diff --git a/src/EventBand/Processor/Control/TimeLimiter.php b/src/EventBand/Processor/Control/TimeLimiter.php
@@ -8,7 +8,7 @@
  */
 namespace EventBand\Processor\Control;
 
-use EventBand\Processor\DispatchStopEvent;
+use EventBand\Processor\StoppableDispatchEvent;
 
 class TimeLimiter
 {
@@ -30,10 +30,13 @@ public function initTimer()
         $this->startTime = time();
     }
 
-    public function checkLimit(DispatchStopEvent $event)
+    public function checkLimit(StoppableDispatchEvent $event)
     {
-        if ($this->startTime + $this->limit >= time()) {
+        $now = time();
+        if ($this->startTime + $this->limit >= $now) {
             $event->stopDispatching();
+            return 0;
         }
+        return (int) ($this->startTime + $this->limit - $now);
     }
 }
diff --git a/src/EventBand/Processor/DispatchProcessor.php b/src/EventBand/Processor/DispatchProcessor.php
@@ -39,10 +39,7 @@ public function __construct(BandDispatcher $dispatcher, EventConsumer $consumer,
         }
         $this->band = $band;
 
-        if (($timeout = (int) $timeout) < 0) {
-            throw new \InvalidArgumentException(sprintf('Timeout %d < 0', $timeout));
-        }
-        $this->timeout = $timeout;
+        $this->setTimeout($timeout);
     }
 
     /**
@@ -69,6 +66,14 @@ public function process()
         $this->dispatcher->dispatchEvent(new ProcessStopEvent());
     }
 
+    public function setTimeout($timeout)
+    {
+        if (($timeout = (int)$timeout) < 0) {
+            throw new \InvalidArgumentException(sprintf('Timeout %d < 0', $timeout));
+        }
+        $this->timeout = $timeout;
+    }
+
     private function getDispatchCallback(&$dispatching)
     {
         return function (Event $event) use (&$dispatching) {