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

Director rollback in case of existing object during live-creation

This commit is contained in:
Damiano Chini 2020-06-30 18:00:39 +02:00
parent b1c29c16d0
commit 407ccddc2f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Director/Cli/ObjectCommand.php
View File

@ -124,7 +124,8 @@ class ObjectCommand extends Command
if ($this->api()->createObjectAtRuntime($object)) { if ($this->api()->createObjectAtRuntime($object)) {
echo "Live creation for '$name' succeeded\n"; echo "Live creation for '$name' succeeded\n";
} else { } else {
echo "Live creation for '$name' succeeded\n"; echo "Live creation for '$name' failed\n";
$object->delete();
exit(1); exit(1);
} }

9
library/Director/Core/CoreApi.php
View File

@ -314,10 +314,11 @@ class CoreApi implements DeploymentApiInterface
$key = $object->getShortTableName(); $key = $object->getShortTableName();
$command = sprintf( $command = sprintf(
"f = function() {\n" 'existing = get_%s("%s")'
. ' existing = get_%s("%s")' . "\nf = function() {\n"
. "\n if (existing) { return false }" . "%s\n}\n"
. "\n%s\n}\nInternal.run_with_activation_context(f)\n", . "if (existing) { false } else {\n"
. "Internal.run_with_activation_context(f)\n}\n",
$key, $key,
$object->get('object_name'), $object->get('object_name'),
(string) $object (string) $object