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: delegate new "replace" to the object

This commit is contained in:
Thomas Gelf 2015-12-15 19:09:22 +01:00
parent 738a690c43
commit f7d9867b97
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,24 +299,25 @@ class Sync
}
}
}
if (array_key_exists($key, $objects)) {
switch ($rule->update_policy) {
case 'override':
// TODO: Only override if it doesn't equal
$objects[$key] = IcingaObject::createByType(
$object = IcingaObject::createByType(
$rule->object_type,
$newProps,
$db
);
foreach ($newVars as $prop => $var) {
$objects[$key]->vars()->$prop = $var;
$object->vars()->$prop = $var;
}
if (! empty($imports)) {
$objects[$key]->imports()->set($imports);
$object->imports()->set($imports);
}
$objects[$key]->replaceWith($object);
break;
case 'merge':
@ -413,6 +414,7 @@ class Sync
$db = $rule->getConnection();
// TODO: Evaluate whether fetching data should happen within the same transaction
$objects = $this->prepareSyncForRule($rule);
$dba = $db->getDbAdapter();
$dba->beginTransaction();
foreach ($objects as $object) {