Przeglądaj źródła

Add support for elastica 8, fixes #1917

Jordi Boggiano 1 rok temu
rodzic
commit
e266d7d914
2 zmienionych plików z 7 dodań i 3 usunięć
  1. 5 2
      composer.json
  2. 2 1
      src/Monolog/Handler/ElasticaHandler.php

+ 5 - 2
composer.json

@@ -31,7 +31,7 @@
         "phpstan/phpstan-strict-rules": "^1.4",
         "phpunit/phpunit": "^10.5.17",
         "predis/predis": "^1.1 || ^2",
-        "ruflin/elastica": "^7",
+        "ruflin/elastica": "^7 || ^8",
         "symfony/mailer": "^5.4 || ^6",
         "symfony/mime": "^5.4 || ^6"
     },
@@ -72,6 +72,9 @@
     "config": {
         "lock": false,
         "sort-packages": true,
-        "platform-check": false
+        "platform-check": false,
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
 }

+ 2 - 1
src/Monolog/Handler/ElasticaHandler.php

@@ -11,6 +11,7 @@
 
 namespace Monolog\Handler;
 
+use Elastic\Transport\Exception\TransportException;
 use Elastica\Document;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Formatter\ElasticaFormatter;
@@ -133,7 +134,7 @@ class ElasticaHandler extends AbstractProcessingHandler
     {
         try {
             $this->client->addDocuments($documents);
-        } catch (ExceptionInterface $e) {
+        } catch (ExceptionInterface | TransportException $e) {
             if (!$this->options['ignore_error']) {
                 throw new \RuntimeException("Error sending messages to Elasticsearch", 0, $e);
             }