"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/base/process.cpp" between
icinga2-2.11.5.tar.gz and icinga2-2.12.0.tar.gz

About: Icinga 2 is an enterprise grade monitoring system which keeps watch over networks and any conceivable network resource.

process.cpp  (icinga2-2.11.5):process.cpp  (icinga2-2.12.0)
skipping to change at line 1027 skipping to change at line 1027
if (m_Timeout != 0) { if (m_Timeout != 0) {
double timeout = m_Result.ExecutionStart + m_Timeout; double timeout = m_Result.ExecutionStart + m_Timeout;
if (timeout < Utility::GetTime()) { if (timeout < Utility::GetTime()) {
Log(LogWarning, "Process") Log(LogWarning, "Process")
<< "Killing process group " << m_PID << " (" << P rettyPrintArguments(m_Arguments) << "Killing process group " << m_PID << " (" << P rettyPrintArguments(m_Arguments)
<< ") after timeout of " << m_Timeout << " second s"; << ") after timeout of " << m_Timeout << " second s";
m_OutputStream << "<Timeout exceeded.>"; m_OutputStream << "<Timeout exceeded.>";
#ifdef _WIN32 #ifdef _WIN32
TerminateProcess(m_Process, 1); TerminateProcess(m_Process, 3);
#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 << "] " << strer ror(error); << "): [errno " << error << "] " << strer ror(error);
could_not_kill = true; could_not_kill = true;
} }
#endif /* _WIN32 */ #endif /* _WIN32 */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)