tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when daemonizing Icinga 

refs #7648
This commit is contained in:
Gunnar Beutner 2014-11-12 12:44:14 +01:00
parent c5a5d1833b
commit a2c5887e51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/application.cpp
View File

@ -223,7 +223,7 @@ void Application::SetResourceLimits(void)
if (!new_argv) { if (!new_argv) {
perror("malloc"); perror("malloc");
exit(1); Exit(EXIT_FAILURE);
} }
new_argv[0] = argv[0]; new_argv[0] = argv[0];
@ -242,7 +242,7 @@ void Application::SetResourceLimits(void)
if (execvp(new_argv[0], new_argv) < 0) if (execvp(new_argv[0], new_argv) < 0)
perror("execvp"); perror("execvp");
exit(1); Exit(EXIT_FAILURE);
} }
# else /* RLIMIT_STACK */ # else /* RLIMIT_STACK */
Log(LogNotice, "Application", "System does not support adjusting the resource limit for stack size (RLIMIT_STACK)"); Log(LogNotice, "Application", "System does not support adjusting the resource limit for stack size (RLIMIT_STACK)");

6
lib/cli/daemoncommand.cpp
View File

@ -190,14 +190,14 @@ static bool Daemonize(void)
if (ret == pid) { if (ret == pid) {
Log(LogCritical, "cli", "The daemon could not be started. See log output for details."); Log(LogCritical, "cli", "The daemon could not be started. See log output for details.");
exit(EXIT_FAILURE); Application::Exit(EXIT_FAILURE);
} else if (ret == -1) { } else if (ret == -1) {
Log(LogCritical, "cli") Log(LogCritical, "cli")
<< "waitpid() failed with error code " << errno << ", \"" << Utility::FormatErrorNumber(errno) << "\""; << "waitpid() failed with error code " << errno << ", \"" << Utility::FormatErrorNumber(errno) << "\"";
exit(EXIT_FAILURE); Application::Exit(EXIT_FAILURE);
} }
exit(0); Application::Exit(0);
} }
#endif /* _WIN32 */ #endif /* _WIN32 */