ConfigObject#OnAllConfigLoaded(): build m_AllParentsAffectingLogging …

…cache recursively from ConfigObject#GetParentsAffectingLogging().
Icinga · Aug 15, 2023 · 7f917b0 · 7f917b0
1 parent aff9687
commit 7f917b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
@@ -419,6 +419,18 @@ void ConfigObject::OnAllConfigLoaded()
 
 	if (!zoneName.IsEmpty())
 		m_Zone = ctype->GetObject(zoneName);
+
+	std::vector<Ptr> toDo {this};
+
+	do {
+		auto current (toDo.back());
+
+		toDo.pop_back();
+
+		if (m_AllParentsAffectingLogging.emplace(current.get()).second) {
+			current->GetParentsAffectingLogging(toDo);
+		}
+	} while (!toDo.empty());
 }
 
 void ConfigObject::CreateChildObjects(const Type::Ptr& childType)

diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp
@@ -9,6 +9,7 @@
 #include "base/type.hpp"
 #include "base/dictionary.hpp"
 #include <boost/signals2.hpp>
+#include <set>
 
 namespace icinga
 {
@@ -81,6 +82,7 @@ class ConfigObject : public ObjectImpl<ConfigObject>
 
 private:
 	ConfigObject::Ptr m_Zone;
+	std::set<ConfigObject*> m_AllParentsAffectingLogging;
 
 	static void RestoreObject(const String& message, int attributeTypes);
 };