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

ExternalCommandProcessor::ExecuteFromFile(): take CheckResultProducer::Ptr

Browse Source
This commit is contained in:
Alexander A. Klimov 2025-04-03 11:02:03 +02:00
parent 4ea07bd880
commit 931c1fab6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/externalcommandprocessor.cpp
View File

@ -247,7 +247,7 @@ void ExternalCommandProcessor::RegisterCommands()
RegisterCommand("DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS", &ExternalCommandProcessor::DisableServicegroupSvcNotifications, 1); RegisterCommand("DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS", &ExternalCommandProcessor::DisableServicegroupSvcNotifications, 1);
} }
void ExternalCommandProcessor::ExecuteFromFile(const String& line, std::deque< std::vector<String> >& file_queue) void ExternalCommandProcessor::ExecuteFromFile(const CheckResultProducer::Ptr& producer, const String& line, std::deque<std::vector<String>>& file_queue)
{ {
if (line.IsEmpty()) if (line.IsEmpty())
return; return;
@ -280,7 +280,7 @@ void ExternalCommandProcessor::ExecuteFromFile(const String& line, std::deque< s
<< "Enqueing external command file " << argvExtra[0]; << "Enqueing external command file " << argvExtra[0];
file_queue.push_back(argvExtra); file_queue.push_back(argvExtra);
} else { } else {
Execute(ts, argv[0], argvExtra); Execute(producer, ts, argv[0], argvExtra);
} }
} }

2
lib/icinga/externalcommandprocessor.hpp
View File

@ -33,7 +33,7 @@ public:
private: private:
ExternalCommandProcessor(); ExternalCommandProcessor();
static void ExecuteFromFile(const String& line, std::deque< std::vector<String> >& file_queue); static void ExecuteFromFile(const CheckResultProducer::Ptr& producer, const String& line, std::deque<std::vector<String>>& file_queue);
static void ProcessHostCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments); static void ProcessHostCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments);
static void ProcessServiceCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments); static void ProcessServiceCheckResult(const CheckResultProducer::Ptr& producer, double time, const std::vector<String>& arguments);