handle exception

lyrixx · lyrixx · commit 957d8c218c66 · 2019-07-16T18:43:33.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -16,22 +16,24 @@
 use Monolog\Handler\AbstractHandler;
 use Monolog\Logger;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Push logs directly to Elasticsearch and format them according to Logstash specification.
  *
- * This handler dials directly with the HTTP interface of elasticsearch. This
- * means it will slow down your application if elasticsearch takes times to
+ * This handler dials directly with the HTTP interface of Elasticsearch. This
+ * means it will slow down your application if Elasticsearch takes times to
  * answer. Even if all HTTP calls are done asynchronously.
  *
  * In a development environment, it's fine to keep the default configuration:
- * For each log, an HTTP request will be made to push the log to Elasticsearch.
+ * for each log, an HTTP request will be made to push the log to Elasticsearch.
  *
- * But in a production environment, it's highly recommended to wrap this handler
- * in an handler with buffering capability (like the FingersCrossedHandler, or
- * BufferHandler) in order to call Elasticsearch only once. For even better
- * performance and fault tolerance, a proper ELK stack is recommended.
+ * In a production environment, it's highly recommended to wrap this handler
+ * in a handler with buffering capabilities (like the FingersCrossedHandler, or
+ * BufferHandler) in order to call Elasticsearch only once with a bulk push. For
+ * even better performance and fault tolerance, a proper ELK (https://www.elastic.co/what-is/elk-stack)
+ * stack is recommended.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
@@ -45,7 +47,7 @@ class ElasticsearchLogstashHandler extends AbstractHandler
     public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, int $level = Logger::DEBUG, bool $bubble = true)
     {
         if (!interface_exists(HttpClientInterface::class)) {
-            throw new \LogicException(sprintf('The %s handler needs symfony/http-client, please run `composer require symfony/http-client`.', __CLASS__));
+            throw new \LogicException(sprintf('The %s handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__));
         }
 
         parent::__construct($level, $bubble);
@@ -63,20 +65,16 @@ public function handle(array $record): bool
 
         $this->sendToElasticsearch([$record]);
 
-        return false === $this->bubble;
+        return !$this->bubble;
     }
 
     public function handleBatch(array $records): void
     {
-        $records = array_filter($records, function (array $record) {
-            return $this->isHandling($record);
-        });
+        $records = array_filter($records, [$this, 'isHandling']);
 
-        if (!$records) {
-            return;
+        if ($records) {
+            $this->sendToElasticsearch($records);
         }
-
-        $this->sendToElasticsearch($records);
     }
 
     protected function getDefaultFormatter(): FormatterInterface
@@ -116,10 +114,36 @@ private function sendToElasticsearch(array $records)
 
         $this->responses->attach($response);
 
-        foreach ($this->client->stream($this->responses, 0) as $response => $chunk) {
-            if (!$chunk->isTimeout() && $chunk->isFirst()) {
+        $this->wait(0.0, false);
+    }
+
+    public function __destruct()
+    {
+        $this->wait(null, true);
+    }
+
+    private function wait(?float $timeout, bool $errorOnTimeout)
+    {
+        $e = null;
+
+        foreach ($this->client->stream($this->responses) 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);
             }
         }
+
+        if ($e) {
+            error_log(sprintf("Could not push logs to Elasticsearch:\n%s", (string) $e));
+        }
     }
 }
