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

Improve log messages for the Process class. 

Refs #6070
This commit is contained in:
Gunnar Beutner 2014-05-23 19:00:55 +02:00
parent 56514f6955
commit 778b51ab6d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/process.cpp
View File

@ -531,7 +531,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
m_PID = m_Process; m_PID = m_Process;
Log(LogNotice, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") + Log(LogNotice, "base", "Running command '" + boost::algorithm::join(m_Arguments, "', '") +
"': PID " + Convert::ToString(m_PID)); "': PID " + Convert::ToString(m_PID));
m_Arguments.clear(); m_Arguments.clear();
@ -582,6 +582,8 @@ bool Process::DoEvents(void)
double timeout = m_Result.ExecutionStart + m_Timeout; double timeout = m_Result.ExecutionStart + m_Timeout;
if (timeout < Utility::GetTime()) { if (timeout < Utility::GetTime()) {
Log(LogNotice, "base", "Killing process '" + Convert::ToString(m_PID) + " after timeout of " + Convert::ToString(m_Timeout) + " seconds");
m_OutputStream << "<Timeout exceeded.>"; m_OutputStream << "<Timeout exceeded.>";
#ifdef _WIN32 #ifdef _WIN32
TerminateProcess(m_Process, 1); TerminateProcess(m_Process, 1);
@ -627,6 +629,8 @@ bool Process::DoEvents(void)
DWORD exitcode; DWORD exitcode;
GetExitCodeProcess(m_Process, &exitcode); GetExitCodeProcess(m_Process, &exitcode);
Log(LogNotice, "base", "PID " + Convert::ToString(m_PID) + " terminated with exit code " + Convert::ToString(exitcode));
#else /* _WIN32 */ #else /* _WIN32 */
int status, exitcode; int status, exitcode;
if (waitpid(m_Process, &status, 0) != m_Process) { if (waitpid(m_Process, &status, 0) != m_Process) {
@ -637,14 +641,16 @@ bool Process::DoEvents(void)
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
exitcode = WEXITSTATUS(status); exitcode = WEXITSTATUS(status);
}
else if (WIFSIGNALED(status)) { Log(LogNotice, "base", "PID " + Convert::ToString(m_PID) + " terminated with exit code " + Convert::ToString(exitcode));
} else if (WIFSIGNALED(status)) {
Log(LogNotice, "base", "PID " + Convert::ToString(m_PID) + " was terminated by signal " + Convert::ToString(WTERMSIG(status)));
std::ostringstream outputbuf; std::ostringstream outputbuf;
outputbuf << "<Terminated by signal " << WTERMSIG(status) << ".>"; outputbuf << "<Terminated by signal " << WTERMSIG(status) << ".>";
output = output + outputbuf.str(); output = output + outputbuf.str();
exitcode = 128; exitcode = 128;
} } else {
else {
exitcode = 128; exitcode = 128;
} }
#endif /* _WIN32 */ #endif /* _WIN32 */