Fix macro priority.

diff --git a/lib/icinga/pluginchecktask.cpp b/lib/icinga/pluginchecktask.cpp
index c3fee3a99711df5f269a33d2af562e61d7fb131f..b40f386dc96f81971c3934d11be67d39601d875a 100644 (file)
--- a/lib/icinga/pluginchecktask.cpp
+++ b/lib/icinga/pluginchecktask.cpp
@@ -41,9 +41,9 @@ Dictionary::Ptr PluginCheckTask::ScriptFunc(const Service::Ptr& service)
        Value raw_command = commandObj->GetCommandLine();
 
        std::vector<MacroResolver::Ptr> resolvers;
-       resolvers.push_back(commandObj);
        resolvers.push_back(service);
        resolvers.push_back(service->GetHost());
+       resolvers.push_back(commandObj);
        resolvers.push_back(IcingaApplication::GetInstance());
 
        Value command = MacroProcessor::ResolveMacros(raw_command, resolvers, Dictionary::Ptr(), Utility::EscapeShellCmd, commandObj->GetEscapeMacros());

diff --git a/lib/icinga/plugineventtask.cpp b/lib/icinga/plugineventtask.cpp
index 78afaa78d3da694090197b4d68ea84b70a9dcf0f..b29b74526427e6bf51c8c5f3505528f764eb7e3f 100644 (file)
--- a/lib/icinga/plugineventtask.cpp
+++ b/lib/icinga/plugineventtask.cpp
@@ -39,9 +39,9 @@ void PluginEventTask::ScriptFunc(const Service::Ptr& service)
        Value raw_command = commandObj->GetCommandLine();
 
        std::vector<MacroResolver::Ptr> resolvers;
-       resolvers.push_back(commandObj);
        resolvers.push_back(service);
        resolvers.push_back(service->GetHost());
+       resolvers.push_back(commandObj);
        resolvers.push_back(IcingaApplication::GetInstance());
 
        Value command = MacroProcessor::ResolveMacros(raw_command, resolvers, Dictionary::Ptr(), Utility::EscapeShellCmd, commandObj->GetEscapeMacros());

diff --git a/lib/icinga/pluginnotificationtask.cpp b/lib/icinga/pluginnotificationtask.cpp
index aec950e487191205204a15ae2f0f6e8776a0b64f..5560a28abf7aad49ddd38767721a8ca3c51cac1f 100644 (file)
--- a/lib/icinga/pluginnotificationtask.cpp
+++ b/lib/icinga/pluginnotificationtask.cpp
@@ -50,10 +50,10 @@ void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification, c
        std::vector<MacroResolver::Ptr> resolvers;
        resolvers.push_back(user);
        resolvers.push_back(notificationMacroResolver);
-       resolvers.push_back(commandObj);
        resolvers.push_back(notification);
        resolvers.push_back(service);
        resolvers.push_back(service->GetHost());
+       resolvers.push_back(commandObj);
        resolvers.push_back(IcingaApplication::GetInstance());
 
        Value command = MacroProcessor::ResolveMacros(raw_command, resolvers, cr, Utility::EscapeShellCmd, commandObj->GetEscapeMacros());