tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

icinga2 daemon: w/o --dump-objects just check for circular refs

Browse Source 
and don't malloc() anything.
This commit is contained in:
Alexander A. Klimov 2022-11-22 17:01:46 +01:00
parent e53ec2a50f
commit 7c481742f4
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/serializer.cpp
View File

@ -291,6 +291,12 @@ static Value SerializeInternal(const Value& value, int attributeTypes, Serialize
return SerializeObject(input, attributeTypes, stack, dryRun); return SerializeObject(input, attributeTypes, stack, dryRun);
} }
void icinga::AssertNoCircularReferences(const Value& value)
{
SerializeStack stack;
SerializeInternal(value, FAConfig, stack, true);
}
Value icinga::Serialize(const Value& value, int attributeTypes) Value icinga::Serialize(const Value& value, int attributeTypes)
{ {
SerializeStack stack; SerializeStack stack;

1
lib/base/serializer.hpp
View File

@ -24,6 +24,7 @@ private:
std::vector<String> m_Path; std::vector<String> m_Path;
}; };
void AssertNoCircularReferences(const Value& value);
Value Serialize(const Value& value, int attributeTypes = FAState); Value Serialize(const Value& value, int attributeTypes = FAState);
Value Deserialize(const Value& value, bool safe_mode = false, int attributeTypes = FAState); Value Deserialize(const Value& value, bool safe_mode = false, int attributeTypes = FAState);
Value Deserialize(const Object::Ptr& object, const Value& value, bool safe_mode = false, int attributeTypes = FAState); Value Deserialize(const Object::Ptr& object, const Value& value, bool safe_mode = false, int attributeTypes = FAState);

6
lib/config/configitem.cpp
View File

@ -281,7 +281,11 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
Value serializedObject; Value serializedObject;
try { try {
serializedObject = Serialize(dobj, FAConfig); if (ConfigCompilerContext::GetInstance()->IsOpen()) {
serializedObject = Serialize(dobj, FAConfig);
} else {
AssertNoCircularReferences(dobj);
}
} catch (const CircularReferenceError& ex) { } catch (const CircularReferenceError& ex) {
BOOST_THROW_EXCEPTION(ValidationError(dobj, ex.GetPath(), "Circular references are not allowed")); BOOST_THROW_EXCEPTION(ValidationError(dobj, ex.GetPath(), "Circular references are not allowed"));
} }