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

Sync: make new purge strategies the new default

This commit is contained in:
Thomas Gelf 2016-06-26 14:00:37 +02:00
parent 4c9c72d057
commit 5b509a1b7c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/Director/Import/Sync.php
View File

@ -645,18 +645,22 @@ class Sync
}
$noAction = array();
foreach ($this->rule->purgeStrategy()->listObjectsToPurge() as $key) {
if (array_key_exists($key, $newObjects)) {
// Object has been touched, do not delete
continue;
}
if (array_key_exists($key, $this->objects)) {
$object = $this->objects[$key];
if (! $object->hasBeenModified()) {
$object->markForRemoval();
}
}
}
foreach ($this->objects as $key => $object) {
if (array_key_exists($key, $newObjects)) {
// Stats?
} elseif ($object->hasBeenLoadedFromDb() && $this->rule->purge_existing === 'y') {
$object->markForRemoval();
// TODO: this is for stats, preview, summary:
// $this->remove[] = $object;
} else {
if (! $object->hasBeenModified() && ! $object->shouldBeRemoved()) {
$noAction[] = $key;
}
}