tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigJob: fix dealing with currently active config

Browse Source
This commit is contained in:
Thomas Gelf 2016-06-17 13:20:15 +02:00
parent a761bb108b
commit 6665d6d80f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Director/Job/ConfigJob.php
View File

@ -29,6 +29,8 @@ class ConfigJob extends JobHook
if ($this->shouldDeploy($config)) { if ($this->shouldDeploy($config)) {
$this->deploy($config); $this->deploy($config);
} }
$this->clearLastDeployment();
} }
protected function api() protected function api()
@ -83,7 +85,7 @@ class ConfigJob extends JobHook
return false; return false;
} }
if ($this->getActiveChecksum() === $config->getChecksum()) { if ($this->getActiveChecksum() === $config->getHexChecksum()) {
return false; return false;
} }
@ -94,7 +96,6 @@ class ConfigJob extends JobHook
protected function deploy(IcingaConfig $config) protected function deploy(IcingaConfig $config)
{ {
$this->clearLastDeployment();
$db = $this->db(); $db = $this->db();
$api = $this->api(); $api = $this->api();
$api->wipeInactiveStages($db); $api->wipeInactiveStages($db);

5
library/Director/Objects/DirectorDeploymentLog.php
View File

@ -76,10 +76,7 @@ class DirectorDeploymentLog extends DbObject
$db = $connection->getDbAdapter(); $db = $connection->getDbAdapter();
$query = $db->select() $query = $db->select()
->from('director_deployment_log', array('c' => $connection->dbHexFunc('config_checksum'))) ->from('director_deployment_log', array('c' => $connection->dbHexFunc('config_checksum')))
->where('stage_name = ?') ->where('stage_name = ?');
->where('stage_collected IS NULL')
->where('startup_succeeded IS NULL')
->order('stage_name');
return $db->fetchOne($query, $stage); return $db->fetchOne($query, $stage);
} }