handle exception

symfony · Jul 16, 2019 · 67c1c45 · 67c1c45
1 parent 12815d4
commit 67c1c45
Showing 1 changed file with 46 additions and 2 deletions.
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -16,6 +16,7 @@
 use Monolog\Handler\AbstractHandler;
 use Monolog\Logger;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -116,10 +117,53 @@ private function sendToElasticsearch(array $records)
 
         $this->responses->attach($response);
 
-        foreach ($this->client->stream($this->responses, 0) as $response => $chunk) {
-            if (!$chunk->isTimeout() && $chunk->isFirst()) {
+        try {
+            $this->wait(0.0, false);
+        } catch (ExceptionInterface $e) {
+            error_log(sprintf("Could not push logs to elasticsearch:\n%s", (string) $e));
+        }
+    }
+
+    public function __destruct()
+    {
+        try {
+            $this->wait(null, true);
+        } catch (ExceptionInterface $e) {
+            error_log(sprintf("Could not push logs to elasticsearch:\n%s", (string) $e));
+        }
+    }
+
+    private function wait(?float $timeout, bool $errorOnTimeout)
+    {
+        $e = null;
+        $remainingTimeout = $timeout;
+
+        if (!$errorOnTimeout && $remainingTimeout) {
+            $startTime = microtime(true);
+        }
+
+        foreach ($this->client->stream($this->responses, $remainingTimeout) as $response => $chunk) {
+            try {
+                if ($chunk->isTimeout() && !$errorOnTimeout) {
+                    continue;
+                }
+                if (!$chunk->isFirst() && !$chunk->isLast()) {
+                    continue;
+                }
+                if ($chunk->isLast()) {
+                    $this->responses->detach($response);
+                }
+            } catch (ExceptionInterface $e) {
                 $this->responses->detach($response);
+            } finally {
+                if (!$errorOnTimeout && $remainingTimeout) {
+                    $remainingTimeout = max(0.0, $timeout - microtime(true) + $startTime);
+                }
             }
         }
+
+        if ($e) {
+            throw $e;
+        }
     }
 }