tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ConditionalDeployment, ConfigCommand: wording 

fixes #2523
This commit is contained in:
Thomas Gelf 2022-04-13 14:07:24 +02:00
parent 70e8c06b06
commit 0539819d4c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/clicommands/ConfigCommand.php
View File

@ -138,7 +138,7 @@ class ConfigCommand extends Command
if ($timeout = $this->getWaitTime()) { if ($timeout = $this->getWaitTime()) {
$deployed = $deployer->waitForStartupAfterDeploy($deployment, $timeout); $deployed = $deployer->waitForStartupAfterDeploy($deployment, $timeout);
if ($deployed !== true) { if ($deployed !== true) {
$this->fail("Failed to deploy config '%s': %s\n", $checksum, $deployed); $this->fail("Waiting for Icinga restart failed '%s': %s\n", $checksum, $deployed);
} }
} }
} }

1
doc/82-Changelog.md
View File

@ -13,6 +13,7 @@ v1.10.0 (unreleased)
### CLI ### CLI
* FIX: config deploy doesn't try to wait in case of no deployment (#2522) * FIX: config deploy doesn't try to wait in case of no deployment (#2522)
* FEATURE: improved wording for deployment error messages (#2523)
1.9.1 1.9.1
----- -----

6
library/Director/Deployment/ConditionalDeployment.php
View File

@ -95,14 +95,14 @@ class ConditionalDeployment implements LoggerAwareInterface
continue; continue;
} }
if ($stageCollected === 'n') { if ($stageCollected === 'n') {
return 'stage has not been collected'; return 'stage has not been collected (Icinga "lost" the deployment)';
} }
if ($deploymentFromDB->get('startup_succeeded') === 'y') { if ($deploymentFromDB->get('startup_succeeded') === 'y') {
return true; return true;
} }
return 'deployment failed during startup'; return 'deployment failed during startup (usually a Configuration Error)';
} }
return 'deployment timed out'; return 'deployment timed out (while waiting for an Icinga restart)';
} }
/** /**