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

DeploymentStatus: fix CLI command for PostgreSQL

Browse Source 
fixes #2260
This commit is contained in:
Thomas Gelf 2022-01-10 18:18:09 +01:00
parent 0fcbc2783b
commit 251cd309be
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/Director/Deployment/DeploymentStatus.php
View File

@ -34,13 +34,21 @@ class DeploymentStatus
$configChecksum = null;
if ($stageName = $this->api->getActiveStageName()) {
$activityLogChecksum = DirectorDeploymentLog::getRelatedToActiveStage($this->api, $this->db);
$lastActivityLogChecksum = bin2hex($activityLogChecksum->last_activity_checksum);
$configChecksum = $this->getConfigChecksumForStageName($stageName);
$activeConfiguration = [
'stage_name' => $stageName,
'config' => ($configChecksum) ? : null,
'activity' => $lastActivityLogChecksum
];
if ($activityLogChecksum === null) {
$activeConfiguration = [
'stage_name' => $stageName,
'config' => null,
'activity' => null
];
} else {
$lastActivityLogChecksum = bin2hex($activityLogChecksum->last_activity_checksum);
$configChecksum = $this->getConfigChecksumForStageName($stageName);
$activeConfiguration = [
'stage_name' => $stageName,
'config' => ($configChecksum) ? : null,
'activity' => $lastActivityLogChecksum
];
}
}
$result = [
'active_configuration' => (object) $activeConfiguration,
@ -81,7 +89,7 @@ class DeploymentStatus
}, $configChecksums));
$binaryConfigChecksums = [];
foreach ($configChecksums as $singleConfigChecksum) {
$binaryConfigChecksums[$singleConfigChecksum] = hex2bin($singleConfigChecksum);
$binaryConfigChecksums[$singleConfigChecksum] = $this->db->quoteBinary(hex2bin($singleConfigChecksum));
}
$deployedConfigs = $this->getDeployedConfigs(array_values($binaryConfigChecksums));
@ -125,7 +133,7 @@ class DeploymentStatus
$generatedConfigQuery = $db->select()->from(
array('a' => 'director_activity_log'),
array('id' => 'a.id')
)->where('a.checksum = ?', hex2bin($singleActivityLogChecksum));
)->where('a.checksum = ?', $this->db->quoteBinary(hex2bin($singleActivityLogChecksum)));
if ($singleActivityLogData = $db->fetchOne($generatedConfigQuery)) {
if ($lastDeploymentActivityLogId = $db->getLastDeploymentActivityLogId()) {
if ($singleActivityLogData->id > $lastDeploymentActivityLogId) {