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

CoreApi: skip incomplete stages

Browse Source 
fixes #13028
This commit is contained in:
Thomas Gelf 2016-11-02 11:06:15 +01:00
parent ee0def7d2b
commit e410beb935
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Director/Core/CoreApi.php
View File

@ -501,9 +501,7 @@ constants
try { try {
$availableFiles = $this->listStageFiles($stage); $availableFiles = $this->listStageFiles($stage);
} catch (Exception $e) { } catch (Exception $e) {
// TODO: This is not correct. We might miss logs as af an ongoing reload // Could not collect stage files. Doesn't matter, let's try next time
$deployment->set('stage_collected', 'y');
$deployment->store();
continue; continue;
} }
@ -518,6 +516,9 @@ constants
$deployment->set('startup_log', $this->shortenStartupLog( $deployment->set('startup_log', $this->shortenStartupLog(
$this->getStagedFile($stage, 'startup.log') $this->getStagedFile($stage, 'startup.log')
)); ));
} else {
// Stage seems to be incomplete, let's try again next time
continue;
} }
$deployment->set('stage_collected', 'y'); $deployment->set('stage_collected', 'y');