]> granicus.if.org Git - icinga2/commitdiff
Remove init.conf from icinga.cpp
authorNoah Hilverling <noah.hilverling@icinga.com>
Wed, 4 Apr 2018 11:53:18 +0000 (13:53 +0200)
committerNoah Hilverling <noah.hilverling@icinga.com>
Wed, 4 Apr 2018 11:53:18 +0000 (13:53 +0200)
icinga-app/icinga.cpp

index a8caaabea6ca2ba143096b075a03dcf3f6bd6d19..31f6dc3d4270a7ab254eeadb2347be79d1f4d50c 100644 (file)
@@ -222,25 +222,6 @@ int Main(void)
        ScriptGlobal::Set("BuildCompilerName", ICINGA_BUILD_COMPILER_NAME);
        ScriptGlobal::Set("BuildCompilerVersion", ICINGA_BUILD_COMPILER_VERSION);
 
-       String initconfig = Application::GetSysconfDir() + "/icinga2/init.conf";
-
-       if (Utility::PathExists(initconfig)) {
-               Expression *expression;
-               try {
-                       expression = ConfigCompiler::CompileFile(initconfig);
-
-                       ScriptFrame frame;
-                       expression->Evaluate(frame);
-               } catch (const std::exception& ex) {
-                       delete expression;
-
-                       Log(LogCritical, "config", DiagnosticInformation(ex));
-                       return EXIT_FAILURE;
-               }
-
-               delete expression;
-       }
-
        if (!autocomplete)
                Application::SetResourceLimits();