Catch throwables

WyriHaximus · Jul 13, 2017 · cbed3da · cbed3da
1 parent e9ac7ca
commit cbed3da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Messenger.php b/src/Messenger.php
@@ -140,6 +140,8 @@ public function callRpc($target, $payload)
             throw new \Exception('RPC must return promise');
         } catch (\Exception $exception) {
             return new RejectedPromise($exception);
+        } catch (\Throwable $exception) {
+            return new RejectedPromise($exception);
         }
     }
 
@@ -300,6 +302,8 @@ protected function iterateMessages(array $messages, $source)
                 $messageFactory::fromLine($message, $this->options['lineOptions'])->handle($this, $source);
             } catch (\Exception $exception) {
                 $this->emit('error', [$exception, $this]);
+            } catch (\Throwable $exception) {
+                $this->emit('error', [$exception, $this]);
             }
         }
     }

diff --git a/src/Process.php b/src/Process.php
@@ -50,9 +50,7 @@ function (Payload $payload) {
      */
     public static function create(LoopInterface $loop, Messenger $messenger)
     {
-        try {
-            return new Process($loop, $messenger);
-        } catch (\Exception $exeption) {
+        $reject = function ($exeption) use ($messenger, $loop) {
             $messenger->error(MessagesFactory::error([
                 'message' => $exeption->getMessage(),
                 'code' => $exeption->getCode(),
@@ -62,6 +60,13 @@ public static function create(LoopInterface $loop, Messenger $messenger)
             $loop->addTimer(1, function () use ($loop) {
                 $loop->stop();
             });
+        };
+        try {
+            return new Process($loop, $messenger);
+        } catch (\Exception $exeption) {
+            $reject($exeption);
+        } catch (\Throwable $exeption) {
+            $reject($exeption);
         }
     }