ConfigObject::DumpModifiedAttributes(): pass original value to callba…

…ck as well refs #8717
Icinga · Apr 22, 2021 · 93693ba · 93693ba
1 parent d9ae615
commit 93693ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
@@ -649,7 +649,7 @@ void ConfigObject::StopObjects()
 	}
 }
 
-void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&)>& callback)
+void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&, const Value&)>& callback)
 {
 	for (const Type::Ptr& type : Type::GetAllTypes()) {
 		auto *dtype = dynamic_cast<ConfigType *>(type.get());
@@ -703,7 +703,7 @@ void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigO
 				} else
 					modifiedValue = currentValue;
 
-				callback(object, key, modifiedValue);
+				callback(object, key, kv.second, modifiedValue);
 			}
 		}
 	}

diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp
@@ -76,7 +76,7 @@ class ConfigObject : public ObjectImpl<ConfigObject>
 	static void RestoreObjects(const String& filename, int attributeTypes = FAState);
 	static void StopObjects();
 
-	static void DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&)>& callback);
+	static void DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&, const Value&)>& callback);
 
 	static Object::Ptr GetPrototype();
 

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
@@ -175,7 +175,7 @@ void IcingaApplication::DumpModifiedAttributes()
 	fp.exceptions(std::ofstream::failbit | std::ofstream::badbit);
 
 	ConfigObject::Ptr previousObject;
-	ConfigObject::DumpModifiedAttributes([&fp, &previousObject](const ConfigObject::Ptr& object, const String& attr, const Value& value) {
+	ConfigObject::DumpModifiedAttributes([&fp, &previousObject](const ConfigObject::Ptr& object, const String& attr, const Value&, const Value& value) {
 		PersistModAttrHelper(fp, previousObject, object, attr, value);
 	});