Skip to content

BUGFIX: Handle PSR-7 ApiException responses #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erkenes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BUGFIX: Handle PSR-7 ApiException responses #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions Classes/UpdateAliasJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Neos\Flow\Log\Utility\LogEnvironment;
use Neos\Flow\Utility\Algorithms;
use Psr\Log\LoggerInterface;
use Psr\Http\Message\ResponseInterface;

class UpdateAliasJob implements JobInterface
{
Expand Down Expand Up @@ -137,11 +138,43 @@ protected function cleanupOldIndices(): void
}
}
} catch (ApiException $exception) {
$response = json_decode($exception->getResponse(), true, 512, JSON_THROW_ON_ERROR);
if ($response->error instanceof \stdClass) {
$this->logger->error(sprintf('Old indices for alias %s could not be removed. ElasticSearch responded with status %s, saying "%s: %s"', $this->indexPostfix, $response->status, $response->error->type, $response->error->reason), LogEnvironment::fromMethodName(__METHOD__));
$responseBody = $exception->getResponse() instanceof ResponseInterface
? $exception->getResponse()->getBody()->__toString()
: (string) $exception->getResponse();
$response = json_decode($responseBody, true, 512, JSON_THROW_ON_ERROR);

if (is_array($response)) {
$this->logger->error(
sprintf(
'Old indices for alias %s could not be removed. ElasticSearch responded with status %s, saying "%s: %s"',
$this->indexPostfix,
$response['status'],
$response['error']['type'],
$response['error']['reason']
),
LogEnvironment::fromMethodName(__METHOD__)
);
} elseif ($response->error instanceof \stdClass) {
$this->logger->error(
sprintf(
'Old indices for alias %s could not be removed. ElasticSearch responded with status %s, saying "%s: %s"',
$this->indexPostfix,
$response->status,
$response->error->type,
$response->error->reason
),
LogEnvironment::fromMethodName(__METHOD__)
);
} else {
$this->logger->error(sprintf('Old indices for alias %s could not be removed. ElasticSearch responded with status %s, saying "%s"', $this->indexPostfix, $response->status, $response->error), LogEnvironment::fromMethodName(__METHOD__));
$this->logger->error(
sprintf(
'Old indices for alias %s could not be removed. ElasticSearch responded with status %s, saying "%s"',
$this->indexPostfix,
$response->status,
$response->error
),
LogEnvironment::fromMethodName(__METHOD__)
);
}
}
}
Expand Down