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: separate datalist cleanup logic

This commit is contained in:
Thomas Gelf 2016-02-19 12:42:02 +01:00
parent 7141fb2612
commit c1f3e1c041
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,6 +257,34 @@ class Sync
return $imported; return $imported;
} }
// TODO: This is rubbish, we need to filter at fetch time
protected function removeForeignListEntries(& $objects, & $properties)
{
$listId = null;
foreach ($properties as $prop) {
if ($prop->destination_field === 'list_id') {
$listId = (int) $prop->source_expression;
}
}
if ($listId === null) {
throw new IcingaException(
'Cannot sync datalist entry without list_ist'
);
}
$no = array();
foreach ($objects as $k => $o) {
if ($o->list_id !== $listId) {
$no[] = $k;
}
}
foreach ($no as $k) {
unset($objects[$k]);
}
}
/** /**
* Evaluates a SyncRule and returns a list of modified objects * Evaluates a SyncRule and returns a list of modified objects
* *
@ -273,33 +301,11 @@ class Sync
$sources = $this->perpareImportSources($properties, $db); $sources = $this->perpareImportSources($properties, $db);
$imported = $this->fetchImportedData($sources, $properties, $rule, $db); $imported = $this->fetchImportedData($sources, $properties, $rule, $db);
// TODO: Filter auf object, nicht template // TODO: Make object_type and object_name mandatory?
$objects = IcingaObject::loadAllByType($rule->object_type, $db); $objects = IcingaObject::loadAllByType($rule->object_type, $db);
if ($rule->object_type === 'datalistEntry') { if ($rule->object_type === 'datalistEntry') {
$listId = null; $this->removeForeignListEntries($objects, $properties);
foreach ($properties as $prop) {
if ($prop->destination_field === 'list_id') {
$listId = (int) $prop->source_expression;
}
}
if ($listId === null) {
throw new IcingaException(
'Cannot sync datalist entry without list_ist'
);
}
$no = array();
foreach ($objects as $k => $o) {
if ($o->list_id !== $listId) {
$no[] = $k;
}
}
foreach ($no as $k) {
unset($objects[$k]);
}
} }
$objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name'; $objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name';