Prevent silencing ExitFailure in ProcessContext->join() (#207)

amphp · Dec 21, 2024 · 5113111 · 5113111
1 parent 9777db1
commit 5113111
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Context/ProcessContext.php b/src/Context/ProcessContext.php
@@ -281,11 +281,16 @@ public function join(?Cancellation $cancellation = null): mixed
         $data = $this->receiveExitResult($cancellation);
 
         $code = $this->process->join();
-        if ($code !== 0) {
-            throw new ContextException(\sprintf("Context exited with code %d", $code));
-        }
 
-        return $data->getResult();
+        try {
+            return $data->getResult();
+        } finally {
+            if ($code !== 0) {
+                // If an ExitFailure throws above, the exception will be automatically attached as the previous
+                // exception on the instance thrown below.
+                throw new ContextException(\sprintf("Context exited with code %d", $code));
+            }
+        }
     }
 
     /**