Discard unused config items as early as possibly.

Refs #5400
2013-12-20 13:15:05 +01:00 · 2013-12-20 13:15:05 +01:00 · 38aa231a2d
parent a4ba11bd13
commit 38aa231a2d
2 changed files with 3 additions and 3 deletions
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@ -113,9 +113,6 @@ static bool LoadConfigFiles(const String& appType, bool validateOnly)
 	if (!result)
 		return false;

-	ConfigItem::DiscardItems();
-	ConfigType::DiscardTypes();
-
 	return true;
 }

--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@ -313,6 +313,9 @@ bool ConfigItem::ActivateItems(bool validateOnly)

 	upq.Join();

+	ConfigItem::DiscardItems();
+	ConfigType::DiscardTypes();
+
 	/* log stats for external parsers */
 	BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
 		if (type->GetObjects().size() > 0)