From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 22 Jan 2013 11:39:33 +0000 (+0100)
Subject: Pass through timestamps to external command handlers.
X-Git-Tag: v0.0.2~687
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61f2b5f0cf13761e9e79b32d15e6a34c3cfa419d;p=icinga2

Pass through timestamps to external command handlers.
---

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index 23fd6754c..eb5befb0a 100644
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -179,7 +179,7 @@ void CompatComponent::ProcessCommand(const String& command)
 	Logger::Write(LogInformation, "compat", msgbuf.str());
 
 	vector<String> argvExtra(argv.begin() + 1, argv.end());
-	ExternalCommand::Execute(argv[0], argvExtra);
+	ExternalCommand::Execute(ts, argv[0], argvExtra);
 }
 #endif /* _WIN32 */
 
diff --git a/lib/icinga/externalcommand.cpp b/lib/icinga/externalcommand.cpp
index ff94f3daa..131c46678 100644
--- a/lib/icinga/externalcommand.cpp
+++ b/lib/icinga/externalcommand.cpp
@@ -24,7 +24,7 @@ using namespace icinga;
 bool I2_EXPORT ExternalCommand::m_Initialized;
 map<String, ExternalCommand::Callback> I2_EXPORT ExternalCommand::m_Commands;
 
-int ExternalCommand::Execute(const String& command, const vector<String>& arguments)
+int ExternalCommand::Execute(double time, const String& command, const vector<String>& arguments)
 {
 	if (!m_Initialized) {
 		RegisterCommand("HELLO_WORLD", &ExternalCommand::HelloWorld);
@@ -39,7 +39,7 @@ int ExternalCommand::Execute(const String& command, const vector<String>& argume
 	if (it == m_Commands.end())
 		return -1;
 
-	return it->second(arguments);
+	return it->second(time, arguments);
 }
 
 void ExternalCommand::RegisterCommand(const String& command, const ExternalCommand::Callback& callback)
@@ -47,14 +47,14 @@ void ExternalCommand::RegisterCommand(const String& command, const ExternalComma
 	m_Commands[command] = callback;
 }
 
-int ExternalCommand::HelloWorld(const vector<String>& arguments)
+int ExternalCommand::HelloWorld(double time, const vector<String>& arguments)
 {
 	Logger::Write(LogInformation, "icinga", "HelloWorld external command called.");
 
 	return 0;
 }
 
-int ExternalCommand::ProcessServiceCheckResult(const vector<String>& arguments)
+int ExternalCommand::ProcessServiceCheckResult(double time, const vector<String>& arguments)
 {
 	if (arguments.size() < 4)
 		return -1;
@@ -69,10 +69,10 @@ int ExternalCommand::ProcessServiceCheckResult(const vector<String>& arguments)
 	result->Set("state", PluginCheckTask::ExitStatusToState(exitStatus));
 
 	double now = Utility::GetTime();
-	result->Set("schedule_start", now);
-	result->Set("schedule_end", now);
-	result->Set("execution_start", now);
-	result->Set("execution_end", now);
+	result->Set("schedule_start", time);
+	result->Set("schedule_end", time);
+	result->Set("execution_start", time);
+	result->Set("execution_end", time);
 
 	service->ProcessCheckResult(result);
 
diff --git a/lib/icinga/externalcommand.h b/lib/icinga/externalcommand.h
index 90702bf83..5506ed967 100644
--- a/lib/icinga/externalcommand.h
+++ b/lib/icinga/externalcommand.h
@@ -26,13 +26,13 @@ namespace icinga
 class I2_ICINGA_API ExternalCommand {
 public:
 
-	static int Execute(const String& command, const vector<String>& arguments);
+	static int Execute(double time, const String& command, const vector<String>& arguments);
 
-	static int HelloWorld(const vector<String>& arguments);
-	static int ProcessServiceCheckResult(const vector<String>& arguments);
+	static int HelloWorld(double time, const vector<String>& arguments);
+	static int ProcessServiceCheckResult(double time, const vector<String>& arguments);
 
 private:
-	typedef function<int (const vector<String>& arguments)> Callback;
+	typedef function<int (double time, const vector<String>& arguments)> Callback;
 
 	static bool m_Initialized;
 	static map<String, Callback> m_Commands;