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

Produce an unknown check result if we failed to kill the process 

refs #4981
This commit is contained in:
Alexander A. Klimov 2017-05-12 15:25:22 +02:00
parent c45529b407
commit 8bf3ab0285
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base/process.cpp
View File

@ -1010,6 +1010,9 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
bool Process::DoEvents(void) bool Process::DoEvents(void)
{ {
bool is_timeout = false; bool is_timeout = false;
#ifndef _WIN32
bool could_not_kill = false;
#endif /* _WIN32 */
if (m_Timeout != 0) { if (m_Timeout != 0) {
double timeout = m_Result.ExecutionStart + m_Timeout; double timeout = m_Result.ExecutionStart + m_Timeout;
@ -1024,10 +1027,12 @@ bool Process::DoEvents(void)
TerminateProcess(m_Process, 1); TerminateProcess(m_Process, 1);
#else /* _WIN32 */ #else /* _WIN32 */
int error = ProcessKill(-m_Process, SIGKILL); int error = ProcessKill(-m_Process, SIGKILL);
if (error) if (error) {
Log(LogWarning, "Process") Log(LogWarning, "Process")
<< "Couldn't kill the process group " << m_PID << " (" << PrettyPrintArguments(m_Arguments) << "Couldn't kill the process group " << m_PID << " (" << PrettyPrintArguments(m_Arguments)
<< "): [errno " << error << "] " << strerror(error); << "): [errno " << error << "] " << strerror(error);
could_not_kill = true;
}
#endif /* _WIN32 */ #endif /* _WIN32 */
is_timeout = true; is_timeout = true;
@ -1073,7 +1078,9 @@ bool Process::DoEvents(void)
<< "PID " << m_PID << " (" << PrettyPrintArguments(m_Arguments) << ") terminated with exit code " << exitcode; << "PID " << m_PID << " (" << PrettyPrintArguments(m_Arguments) << ") terminated with exit code " << exitcode;
#else /* _WIN32 */ #else /* _WIN32 */
int status, exitcode; int status, exitcode;
if (ProcessWaitPID(m_Process, &status) != m_Process) { if (could_not_kill) {
exitcode = 128;
} else if (ProcessWaitPID(m_Process, &status) != m_Process) {
exitcode = 128; exitcode = 128;
Log(LogWarning, "Process") Log(LogWarning, "Process")