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

ConfigJob: small improvements

This commit is contained in:
Thomas Gelf 2016-06-28 14:07:25 +02:00
parent 59e88ab32a
commit 5dc641035d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,12 @@
namespace Icinga\Module\Director\Job; namespace Icinga\Module\Director\Job;
use Exception;
use Icinga\Application\Benchmark; use Icinga\Application\Benchmark;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\IcingaConfig\IcingaConfig;
use Icinga\Module\Director\Hook\JobHook; use Icinga\Module\Director\Hook\JobHook;
use Icinga\Module\Director\Objects\DirectorActivityLog;
use Icinga\Module\Director\Objects\DirectorDeploymentLog; use Icinga\Module\Director\Objects\DirectorDeploymentLog;
use Icinga\Module\Director\Util; use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Form\QuickForm; use Icinga\Module\Director\Web\Form\QuickForm;
@ -19,6 +21,7 @@ class ConfigJob extends JobHook
public function run() public function run()
{ {
$db = $this->db(); $db = $this->db();
$this->clearLastDeployment();
if ($this->shouldGenerate()) { if ($this->shouldGenerate()) {
$config = IcingaConfig::generate($db); $config = IcingaConfig::generate($db);
@ -63,7 +66,7 @@ class ConfigJob extends JobHook
$db = $this->db(); $db = $this->db();
return IcingaConfig::exists( return IcingaConfig::exists(
$this->lastDeployment()->getConfigHexChecksum(), Util::binary2hex(DirectorActivityLog::loadLatest($db)->checksum),
$db $db
); );
} }
@ -104,7 +107,15 @@ class ConfigJob extends JobHook
$this->info('Director ConfigJob ready to deploy "%s"', $checksum); $this->info('Director ConfigJob ready to deploy "%s"', $checksum);
if ($api->dumpConfig($config, $db)) { if ($api->dumpConfig($config, $db)) {
$this->info('Director ConfigJob deployed config "%s"', $checksum); $this->info('Director ConfigJob deployed config "%s"', $checksum);
$api->collectLogFiles($db);
// TODO: Loop and try multiple times?
sleep(2);
try {
$api->collectLogFiles($db);
} catch (Exception $e) {
// Ignore those errors, Icinga may be reloading
}
} else { } else {
throw new IcingaException('Failed to deploy config "%s"', $checksum); throw new IcingaException('Failed to deploy config "%s"', $checksum);
} }