From e266d7d914c1ca652cb9d52bef11340209d4e347 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 9 Nov 2024 14:16:14 +0100 Subject: [PATCH] Add support for elastica 8, fixes #1917 --- composer.json | 7 +++++-- src/Monolog/Handler/ElasticaHandler.php | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 30a99d7a..dfe453fe 100644 --- a/composer.json +++ b/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 + } } } diff --git a/src/Monolog/Handler/ElasticaHandler.php b/src/Monolog/Handler/ElasticaHandler.php index d9b85b4d..4a184b39 100644 --- a/src/Monolog/Handler/ElasticaHandler.php +++ b/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); }