Added thread error handler

6dreams · Dec 13, 2019 · 0c4a921 · 0c4a921
1 parent c57c1d4
commit 0c4a921
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/Pool/DTO/ThreadContext.php b/src/Pool/DTO/ThreadContext.php
@@ -46,20 +46,20 @@ public function finished(): bool
     /**
      * Does execution finished with error.
      *
-     * @return bool
+     * @return \Throwable|null
      */
-    public function hasError(): bool
+    public function getError(): ?\Throwable
     {
         if ($this->future->cancelled()) {
-            return false;
+            return null;
         }
 
         try {
             $this->future->value();
 
-            return false;
+            return null;
         } catch (\Throwable $e) {
-            return true;
+            return $e;
         }
     }
 

diff --git a/src/Pool/Pool.php b/src/Pool/Pool.php
@@ -22,6 +22,9 @@ class Pool implements PoolInterface
     /** @var callable */
     protected $closure;
 
+    /** @var callable */
+    protected $errorHandler;
+
     /**
      * Constructor.
      *
@@ -38,6 +41,20 @@ public function __construct(string $autoloader, int $size, callable $threadFunct
         }
     }
 
+    /**
+     * Error handler.
+     *
+     * @param callable $callback
+     *
+     * @return Pool
+     */
+    public function withErrorCallback(callable $callback): Pool
+    {
+        $this->errorHandler = $callback;
+
+        return $this;
+    }
+
     /**
      * @inheritdoc
      */
@@ -92,7 +109,8 @@ private function isFinished(array &$contexts): bool
         foreach ($contexts as $idx => $context) {
             if ($context->finished()) {
                 unset($contexts[$idx]);
-                if ($context->hasError()) {
+                $error = $context->getError();
+                if ($error && (!$this->errorHandler || ($this->errorHandler && ($this->errorHandler)($error)))) {
                     $this->run($context->getIndex(), $context->getArgs());
 
                     return false;