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

ExternalCommandProcessor::Process*CheckResult(): take CheckResultProducer::Ptr

Browse Source
This commit is contained in:
Alexander A. Klimov 2025-04-02 15:28:15 +02:00
parent 0c91e8f09b
commit ade302a08b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/icinga/externalcommandprocessor.cpp
View File

@ -274,7 +274,7 @@ void ExternalCommandProcessor::ExecuteFromFile(const String& line, std::deque< s
} }
} }
void ExternalCommandProcessor::ProcessHostCheckResult(double time, const std::vector<String>& arguments) void ExternalCommandProcessor::ProcessHostCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments)
{ {
Host::Ptr host = Host::GetByName(arguments[0]); Host::Ptr host = Host::GetByName(arguments[0]);
@ -318,10 +318,10 @@ void ExternalCommandProcessor::ProcessHostCheckResult(double time, const std::ve
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
<< "Processing passive check result for host '" << arguments[0] << "'"; << "Processing passive check result for host '" << arguments[0] << "'";
host->ProcessCheckResult(result); host->ProcessCheckResult(result, producer);
} }
void ExternalCommandProcessor::ProcessServiceCheckResult(double time, const std::vector<String>& arguments) void ExternalCommandProcessor::ProcessServiceCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments)
{ {
Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
@ -356,7 +356,7 @@ void ExternalCommandProcessor::ProcessServiceCheckResult(double time, const std:
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
<< "Processing passive check result for service '" << arguments[1] << "'"; << "Processing passive check result for service '" << arguments[1] << "'";
service->ProcessCheckResult(result); service->ProcessCheckResult(result, producer);
} }
void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<String>& arguments) void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<String>& arguments)

5
lib/icinga/externalcommandprocessor.hpp
View File

@ -5,6 +5,7 @@
#include "icinga/i2-icinga.hpp" #include "icinga/i2-icinga.hpp"
#include "icinga/command.hpp" #include "icinga/command.hpp"
#include "remote/crproducer.hpp"
#include "base/string.hpp" #include "base/string.hpp"
#include <boost/signals2.hpp> #include <boost/signals2.hpp>
#include <vector> #include <vector>
@ -33,8 +34,8 @@ private:
static void ExecuteFromFile(const String& line, std::deque< std::vector<String> >& file_queue); static void ExecuteFromFile(const String& line, std::deque< std::vector<String> >& file_queue);
static void ProcessHostCheckResult(double time, const std::vector<String>& arguments); static void ProcessHostCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments);
static void ProcessServiceCheckResult(double time, const std::vector<String>& arguments); static void ProcessServiceCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments);
static void ScheduleHostCheck(double time, const std::vector<String>& arguments); static void ScheduleHostCheck(double time, const std::vector<String>& arguments);
static void ScheduleForcedHostCheck(double time, const std::vector<String>& arguments); static void ScheduleForcedHostCheck(double time, const std::vector<String>& arguments);
static void ScheduleSvcCheck(double time, const std::vector<String>& arguments); static void ScheduleSvcCheck(double time, const std::vector<String>& arguments);