From ba3910411f82903aa54a36cd7c081c5f6426565e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D1=80=D0=B8=D1=86=D0=BA=D0=B8=D0=B9=20=D0=A0?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BD=D0=BD=D0=B0=D0=B4?= =?UTF-8?q?=D1=8C=D0=B5=D0=B2=D0=B8=D1=87?= <19128@7733.ru> Date: Mon, 6 May 2019 17:49:48 +1000 Subject: [PATCH 1/2] fix incorrect type of rejection response --- src/Elasticsearch/Transport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Elasticsearch/Transport.php b/src/Elasticsearch/Transport.php index 96b4e3ec2..b4364c847 100644 --- a/src/Elasticsearch/Transport.php +++ b/src/Elasticsearch/Transport.php @@ -119,9 +119,9 @@ function ($response) { // Note, this could be a 4xx or 5xx error }, //onFailure - function ($response) { + function (Throwable $response) { // Ignore 400 level errors, as that means the server responded just fine - if (!(isset($response['code']) && $response['code'] >=400 && $response['code'] < 500)) { + if ($response->getCode() < 400 || $response->getCode() >= 500) { // Otherwise schedule a check $this->connectionPool->scheduleCheck(); } From ad7040f395bdcc9bcfecd67d305d452067eac357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D1=80=D0=B8=D1=86=D0=BA=D0=B8=D0=B9=20=D0=A0?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BD=D0=BD=D0=B0=D0=B4?= =?UTF-8?q?=D1=8C=D0=B5=D0=B2=D0=B8=D1=87?= <19128@7733.ru> Date: Mon, 6 May 2019 17:53:59 +1000 Subject: [PATCH 2/2] throwable to use --- src/Elasticsearch/Transport.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Elasticsearch/Transport.php b/src/Elasticsearch/Transport.php index b4364c847..a77160c6d 100644 --- a/src/Elasticsearch/Transport.php +++ b/src/Elasticsearch/Transport.php @@ -10,6 +10,7 @@ use Elasticsearch\Connections\ConnectionInterface; use GuzzleHttp\Ring\Future\FutureArrayInterface; use Psr\Log\LoggerInterface; +use Throwable; /** * Class Transport