Benzine/Docker-Swarm-Loadbalancer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Running in non-swarm-mode causes it to get upset. Fix with try-catch.

Browse source
This commit is contained in:
Greyscale 2022-06-29 15:37:35 +02:00
parent a27879664a
commit d62725db5f
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bouncer/bouncer
View file

@ -447,14 +447,16 @@ class Bouncer
}
// Swarm Services
$services = json_decode($this->client->request('GET', 'services')->getBody()->getContents(), true);
if (isset($services['message'])) {
$this->logger->debug(sprintf('Something happened while interrogating services.. This node is not a swarm node, cannot have services: %s', $services['message']));
} else {
foreach ($services as $service) {
$newInstanceStates['service-'.$service['ID']] = implode('::', [
$service['Version']['Index'],
]);
if ($this->isSwarmMode()) {
$services = json_decode($this->client->request('GET', 'services')->getBody()->getContents(), true);
if (isset($services['message'])) {
$this->logger->debug(sprintf('Something happened while interrogating services.. This node is not a swarm node, cannot have services: %s', $services['message']));
} else {
foreach ($services as $service) {
$newInstanceStates['service-'.$service['ID']] = implode('::', [
$service['Version']['Index'],
]);
}
}
}
$newStateHash = sha1(implode("\n", $newInstanceStates));
@ -473,8 +475,14 @@ class Bouncer
if ($this->s3Enabled()) {
$this->getCertificatesFromS3();
}
$determineSwarmMode = json_decode($this->client->request('GET', 'swarm')->getBody()->getContents(), true);
$this->setSwarmMode(!isset($determineSwarmMode['message']));
try {
$determineSwarmMode = json_decode($this->client->request('GET', 'swarm')->getBody()->getContents(), true);
$this->setSwarmMode(!isset($determineSwarmMode['message']));
} catch (\GuzzleHttp\Exception\ServerException $exception) {
$this->setSwarmMode(false);
}
$this->logger->info(sprintf('%s Swarm mode is %s.', Emoji::CHARACTER_HONEYBEE, $this->isSwarmMode() ? 'enabled' : 'disabled'));
$targets = $this->isSwarmMode() ? $this->findContainersSwarmMode() : $this->findContainersContainerMode();