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

Override exit code on process timeout 

As Icinga first sends a SIGTERM to a check plugin on timeout to allow it to
terminate gracefully, this is not really part of the plugin API specification
and we cannot assume that plugins will handle this correctly and still exit
with an exit code that maps to UNKNOWN. Therefore, once Icinga decides to kill
a process, force its exit code to 128 to be sure the state will be UNKNOWN
after a timeout.
This commit is contained in:
Julian Brost 2021-07-27 09:26:38 +02:00
parent 9684fe8141
commit a55939e462
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base/process.cpp
View File

@ -1133,8 +1133,14 @@ bool Process::DoEvents()
} else if (WIFEXITED(status)) { } else if (WIFEXITED(status)) {
exitcode = WEXITSTATUS(status); exitcode = WEXITSTATUS(status);
Log(LogNotice, "Process") Log msg(LogNotice, "Process");
<< "PID " << m_PID << " (" << PrettyPrintArguments(m_Arguments) << ") terminated with exit code " << exitcode; msg << "PID " << m_PID << " (" << PrettyPrintArguments(m_Arguments)
<< ") terminated with exit code " << exitcode;
if (m_SentSigterm) {
exitcode = 128;
msg << " after sending SIGTERM";
}
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
int signum = WTERMSIG(status); int signum = WTERMSIG(status);
const char *zsigname = strsignal(signum); const char *zsigname = strsignal(signum);