tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-12 16:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

PluginCheckTask::ProcessFinishedHandler(): warn about exit codes outside 0..3

Browse Source 
in the plugin output as well, in addition to the warning log.
This commit is contained in:
Alexander A. Klimov 2024-03-25 12:11:17 +01:00
parent e33befabfb
commit bb13e98ca5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/methods/pluginchecktask.cpp
View File

@ -10,6 +10,7 @@
#include "base/utility.hpp" #include "base/utility.hpp"
#include "base/process.hpp" #include "base/process.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include <sstream>
using namespace icinga; using namespace icinga;
@ -66,15 +67,22 @@ void PluginCheckTask::ProcessFinishedHandler(const Checkable::Ptr& checkable, co
Checkable::CurrentConcurrentChecks.fetch_sub(1); Checkable::CurrentConcurrentChecks.fetch_sub(1);
Checkable::DecreasePendingChecks(); Checkable::DecreasePendingChecks();
String output = pr.Output.Trim();
if (pr.ExitStatus > 3) { if (pr.ExitStatus > 3) {
Process::Arguments parguments = Process::PrepareCommand(commandLine); Process::Arguments parguments = Process::PrepareCommand(commandLine);
Log(LogWarning, "PluginCheckTask") Log(LogWarning, "PluginCheckTask")
<< "Check command for object '" << checkable->GetName() << "' (PID: " << pr.PID << "Check command for object '" << checkable->GetName() << "' (PID: " << pr.PID
<< ", arguments: " << Process::PrettyPrintArguments(parguments) << ") terminated with exit code " << ", arguments: " << Process::PrettyPrintArguments(parguments) << ") terminated with exit code "
<< pr.ExitStatus << ", output: " << pr.Output; << pr.ExitStatus << ", output: " << pr.Output;
}
String output = pr.Output.Trim(); std::stringstream crOutput;
crOutput << "<Terminated with exit code " << pr.ExitStatus
<< " (0x" << std::noshowbase << std::hex << std::uppercase << pr.ExitStatus << ").>";
output += crOutput.str();
}
std::pair<String, String> co = PluginUtility::ParseCheckOutput(output); std::pair<String, String> co = PluginUtility::ParseCheckOutput(output);
cr->SetCommand(commandLine); cr->SetCommand(commandLine);