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

Reverted back to previous object map storage, however added check for modified groups in RefreshDB and CheckDB this should now pass the current Unit Tests

This commit is contained in:
Gregory Hargreaves 2018-10-21 19:00:10 +01:00 committed by Thomas Gelf
parent 9b0d4b4d84
commit ce4850d2de
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Director/Objects/GroupMembershipResolver.php
View File

@ -83,7 +83,7 @@ abstract class GroupMembershipResolver
Benchmark::measure('Rechecking all objects');
$this->recheckAllObjects($this->getAppliedGroups());
if (empty($this->objects)) {
if (empty($this->objects) && empty($this->groups)) {
Benchmark::measure('Nothing to check, got no qualified object');
return $this;
}
@ -106,7 +106,7 @@ abstract class GroupMembershipResolver
if ($force || ! $this->isDeferred()) {
$this->checkDb();
if (empty($this->objects)) {
if (empty($this->objects) && empty($this->groups)) {
Benchmark::measure('Nothing to check, got no qualified object');
return $this;
@ -508,11 +508,11 @@ abstract class GroupMembershipResolver
$staticGroups = [];
if ($this->objects === null) {
$this->objects = $this->fetchAllObjects();
$objects = $this->fetchAllObjects();
} else {
$objects = & $this->objects;
}
$objects = & $this->objects;
$times = array();
foreach ($objects as $object) {