tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icinga DB: serialize icinga:config:checkcommand:argument#value and #set_if as expected

Browse Source 
I.e. keep the serializations as simple as possible:

null     => null
true     => true
42.0     => 42
"foobar" => foobar
{{42}}   => Object of type 'Function'

(["foobar"] and {"foo"="bar"} can't occur there.)
This commit is contained in:
Alexander A. Klimov 2021-04-30 11:50:50 +02:00
parent b08b30ee80
commit f5abec20cf
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

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