tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8725 from Icinga/bugfix/icingadb-serialize-leaves 

Icinga DB: serialize icinga:config:checkcommand:argument#value and #set_if as expected
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-06-29 17:51:41 +02:00 committed by GitHub
parent 1076bd1a06 f5abec20cf
commit 00af435c13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icingadb/icingadb-objects.cpp
View File

@ -978,12 +978,20 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
values = new Dictionary({{"value", kv.second}});
}
{
for (const char *attr : {"value", "set_if"}) {
Value value;
// JsonEncode() the value if it's set.
if (values->Get("value", &value)) {
values->Set("value", JsonEncode(value));
// Stringify if set.
if (values->Get(attr, &value)) {
switch (value.GetType()) {
case ValueString:
break;
case ValueObject:
values->Set(attr, value.Get<Object::Ptr>()->ToString());
break;
default:
values->Set(attr, JsonEncode(value));
}
}
}