From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 5 Nov 2013 07:29:22 +0000 (+0100)
Subject: Don't explicitly load libmethods in libicinga.
X-Git-Tag: v0.0.4~57^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dd6c605d4b851029704f47b0a05dc223fd57690;p=icinga2

Don't explicitly load libmethods in libicinga.

Refs #4995
---

diff --git a/itl/command.conf b/itl/command.conf
index e7a7937b1..12e876413 100644
--- a/itl/command.conf
+++ b/itl/command.conf
@@ -17,6 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
+library "methods"
+
 template CheckCommand "plugin-check-command" {
 	methods = {
 		execute = "PluginCheck"
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index eadcfc5ed..f8e567515 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -38,8 +38,6 @@ INITIALIZE_ONCE(IcingaApplication, &IcingaApplication::StaticInitialize);
 
 void IcingaApplication::StaticInitialize(void)
 {
-	(void) Utility::LoadExtensionLibrary("methods");
-
 	ScriptVariable::Set("IcingaEnableNotifications", true);
 	ScriptVariable::Set("IcingaEnableEventHandlers", true);
 	ScriptVariable::Set("IcingaEnableFlapping", true);