[icinga-checkins] icinga.org: icinga2/fix/cli-node-update-8488: Fix app initialization

git at icinga.org git at icinga.org
Fri Feb 20 21:35:30 CET 2015


Module: icinga2
Branch: fix/cli-node-update-8488
Commit: d1d488a30dbce0a79b83425609d182e18a0b09ea
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=d1d488a30dbce0a79b83425609d182e18a0b09ea

Author: Gunnar Beutner <gunnar at beutner.name>
Date:   Fri Feb 20 20:45:41 2015 +0100

Fix app initialization

refs #6257

---

 icinga-app/icinga.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 0e16bee..6efdc15 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -611,9 +611,6 @@ VOID WINAPI ServiceMain(DWORD argc, LPSTR *argv)
 */
 int main(int argc, char **argv)
 {
-	/* must be called before using any other libbase functions */
-	Application::InitializeBase();
-
 #ifndef _WIN32
 	rlimit rl;
 	if (getrlimit(RLIMIT_NOFILE, &rl) >= 0) {
@@ -633,6 +630,9 @@ int main(int argc, char **argv)
 	}
 #endif /* _WIN32 */
 
+	/* must be called before using any other libbase functions */
+	Application::InitializeBase();
+
 	/* Set command-line arguments. */
 	Application::SetArgC(argc);
 	Application::SetArgV(argv);



More information about the icinga-checkins mailing list