tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-25 18:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fixup set rlimit stack failed condition"

Browse Source 
This reverts commit bf959371c4505bfe27b0682611c035d64b90efd3.

fixes #6257

refs #6260
This commit is contained in:
Jean Flach 2018-04-25 14:26:40 +02:00 committed by Michael Friedrich
parent 292d71c439
commit c1cb8a8bbe
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/application.cpp
View File

@ -258,10 +258,10 @@ void Application::SetResourceLimits(void)
else else
rl.rlim_cur = rl.rlim_max; rl.rlim_cur = rl.rlim_max;
if (setrlimit(RLIMIT_STACK, &rl) < 0) { if (setrlimit(RLIMIT_STACK, &rl) < 0)
Log(LogWarning, "Application") Log(LogWarning, "Application")
<< "Failed adjust resource limit for stack size (RLIMIT_STACK) with error \"" << strerror(errno) << "\""; << "Failed adjust resource limit for stack size (RLIMIT_STACK) with error \"" << strerror(errno) << "\"";
if (set_stack_rlimit) { else if (set_stack_rlimit) {
char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2))); char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2)));
if (!new_argv) { if (!new_argv) {
@ -286,7 +286,6 @@ void Application::SetResourceLimits(void)
perror("execvp"); perror("execvp");
_exit(EXIT_FAILURE); _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)");
# endif /* RLIMIT_STACK */ # endif /* RLIMIT_STACK */