Catch all exceptions thrown while sending an event (#899)

getsentry · Oct 9, 2019 · 61845ad · 61845ad
1 parent a0d0381
commit 61845ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fix handling of fifth argument in the error handler (#892)
+- Catch exception from vendors in `Sentry\Transport\HttpTransport` (#899)
 
 ## 2.2.1 (2019-09-23)
 

diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ cs-dry-run:
 	vendor/bin/php-cs-fixer fix --config=.php_cs --verbose --diff --dry-run
 
 cs-fix:
-	vendor/bin/php-cs-fixer fix --config=.php_cs
+	vendor/bin/php-cs-fixer fix
 
 phpstan:
 	vendor/bin/phpstan analyse

diff --git a/src/Transport/HttpTransport.php b/src/Transport/HttpTransport.php
@@ -106,7 +106,11 @@ public function send(Event $event): ?string
         if ($this->delaySendingUntilShutdown) {
             $this->pendingRequests[] = $promise;
         } else {
-            $promise->wait(false);
+            try {
+                $promise->wait();
+            } catch (\Exception $exception) {
+                return null;
+            }
         }
 
         return $event->getId();
@@ -119,7 +123,10 @@ public function send(Event $event): ?string
     private function cleanupPendingRequests(): void
     {
         while ($promise = array_pop($this->pendingRequests)) {
-            $promise->wait(false);
+            try {
+                $promise->wait();
+            } catch (\Exception $exception) {
+            }
         }
     }
 }