ConfigJob: add configForLatestActivityExists()

2016-06-16 15:51:43 +02:00 · 2016-06-16 15:51:43 +02:00 · bafc53e7a2
parent 734c7c7b02
commit bafc53e7a2
1 changed files with 12 additions and 3 deletions
--- a/library/Director/Job/ConfigJob.php
+++ b/library/Director/Job/ConfigJob.php
@ -52,9 +52,18 @@ class ConfigJob extends JobHook

    protected function shouldGenerate()
    {
-        return $this->getSetting('force_generate')
-                // -> last config?!
-            || $this->db()->countActivitiesSinceLastDeployedConfig() > 0;
+        return $this->getSetting('force_generate') === 'y'
+            || ! $this->configForLatestActivityExists();
+    }
+
+    protected function configForLatestActivityExists()
+    {
+        $db = $this->db();
+
+        return IcingaConfig::exists(
+            DirectorDeploymentLog::loadLatest($db)->getConfigHexChecksum(),
+            $db
+        );
    }

    protected function shouldDeploy(IcingaConfig $config)