Forward thrown exceptions to loop

amphp · Aug 23, 2016 · 1202299 · 1202299
1 parent 214816f
commit 1202299
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/lib/BodyParser.php b/lib/BodyParser.php
@@ -3,6 +3,7 @@
 namespace Aerys;
 
 use Amp\{ Coroutine, Deferred, Internal\Placeholder, Observable, Postponed, Success };
+use Interop\Async\Loop;
 
 class BodyParser implements Observable {
     use Placeholder;
@@ -71,7 +72,13 @@ public function __construct(Request $req, array $options = []) {
                         foreach ($result->getNames() as $field) {
                             foreach ($result->getArray($field) as $_) {
                                 foreach ($this->subscribers as $watcher) {
-                                    $watcher($field);
+                                    try {
+                                        $watcher($field);
+                                    } catch (\Throwable $e) {
+                                        Loop::defer(static function () use ($e) {
+                                            throw $e;
+                                        });
+                                    }
                                 }
                             }
                         }
@@ -231,7 +238,13 @@ private function initField($field, $metadata = []) {
         }
 
         foreach ($this->subscribers as $watcher) {
-            $watcher($field);
+            try {
+                $watcher($field);
+            } catch (\Throwable $e) {
+                Loop::defer(static function () use ($e) {
+                    throw $e;
+                });
+            }
         }
 
         return $dataPostponed;