Use Application::Exit() for main app termination

refs #6682

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index d7155b6480eea1d02ab41c947e2a768fab6593d3..5cec83f9195d40af0a2e8103c269da3bc97ab5d7 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -595,7 +595,7 @@ int Main(void)
        int rc = Application::GetInstance()->Run();
 
 #ifndef _DEBUG
-       _exit(rc); // Yay, our static destructors are pretty much beyond repair at this point.
+       Application::Exit(rc);
 #endif /* _DEBUG */
 
        return rc;
@@ -788,11 +788,11 @@ int main(int argc, char **argv)
                };
 
                StartServiceCtrlDispatcher(dispatchTable);
-               _exit(1);
+               Application::Exit(1);
        }
 #endif /* _WIN32 */
 
        int rc = Main();
 
-       _exit(rc);
+       Application::Exit(rc);
 }

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 1bcd86a822e27a2d9ff99996821b2026329c5582..f69d0194a7b36c24134da23db462f9651d564205 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -112,9 +112,9 @@ Application::~Application(void)
        m_Instance = NULL;
 }
 
-void Application::Exit(int code)
+void Application::Exit(int rc)
 {
-       _exit(code);
+       _exit(rc); // Yay, our static destructors are pretty much beyond repair at this point.
 }
 
 void Application::InitializeBase(void)
@@ -711,7 +711,7 @@ void Application::UpdatePidFile(const String& filename, pid_t pid)
        if (fcntl(fd, F_SETLK, &lock) < 0) {
                Log(LogCritical, "Application", "Could not lock PID file. Make sure that only one instance of the application is running.");
 
-               _exit(EXIT_FAILURE);
+               Application::Exit(EXIT_FAILURE);
        }
 
        if (ftruncate(fd, 0) < 0) {

diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index a97208b45e0f4795715f2ddd4b569db0042902a8..2213fc6698d6b792c0cd3554205fe19979c27239 100644 (file)
--- a/lib/base/application.hpp
+++ b/lib/base/application.hpp
@@ -46,7 +46,7 @@ public:
 
        static Application::Ptr GetInstance(void);
 
-       static void Exit(int code);
+       static void Exit(int rc);
 
        int Run(void);