ConditionalDeployment, ConfigCommand: wording

fixes #2523

application/clicommands/ConfigCommand.php

@@ -138,7 +138,7 @@ public function deployAction()
         if ($timeout = $this->getWaitTime()) {
             $deployed = $deployer->waitForStartupAfterDeploy($deployment, $timeout);
             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);
             }
         }
     }

doc/82-Changelog.md

@@ -13,6 +13,7 @@ v1.10.0 (unreleased)
 
 ### CLI
 * 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
 -----

library/Director/Deployment/ConditionalDeployment.php

@@ -95,14 +95,14 @@ public function waitForStartupAfterDeploy(DirectorDeploymentLog $deploymentLog,
                 continue;
             }
             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') {
                 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)';
     }
 
     /**