upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-02-16 09:20:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

BpNode: Use worst state in minimum state calculation

Browse source 
Ensure we use the worst state within a minimum condition, previously we
did use the Xth best.

refs #167
This commit is contained in:
Markus Frosch 2018-03-20 16:31:58 +01:00
parent e5f7e30472
commit 9120449acb
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/Businessprocess/BpNode.php
View file

@ -364,13 +364,23 @@ class BpNode extends Node
break;
default:
// MIN:
sort($sort_states);
// default -> unknown
$sort_state = 3 << self::SHIFT_FLAGS;
for ($i = 1; $i <= $this->operator; $i++) {
$sort_state = array_shift($sort_states);
if (count($sort_states) >= $this->operator) {
$actualGood = 0;
foreach ($sort_states as $s) {
if (($s >> self::SHIFT_FLAGS) === self::ICINGA_OK) {
$actualGood++;
}
}
if ($actualGood >= $this->operator) {
// condition is fulfilled
$sort_state = self::ICINGA_OK;
} else {
// worst state if not fulfilled
$sort_state = max($sort_states);
}
}
}
if ($sort_state & self::FLAG_DOWNTIME) {