From 820d053363b4990188ee84661b200d82dafc4779 Mon Sep 17 00:00:00 2001 From: Mattia Codato Date: Fri, 3 Jul 2020 15:53:51 +0200 Subject: [PATCH] Refactor MacroResolver::OverrideMacros --- lib/icinga/apiactions.cpp | 4 ++-- lib/icinga/macroprocessor.cpp | 2 +- lib/icinga/macroresolver.hpp | 2 +- lib/methods/pluginchecktask.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp index 57951bf7c..ae06a7ec1 100644 --- a/lib/icinga/apiactions.cpp +++ b/lib/icinga/apiactions.cpp @@ -613,9 +613,9 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object, /* Check if resolved_command exists and it is of type command_type */ Dictionary::Ptr execMacros = new Dictionary(); - MacroResolver::overrideMacros = execMacros; + MacroResolver::OverrideMacros = execMacros; Defer o ([]() { - MacroResolver::overrideMacros = nullptr; + MacroResolver::OverrideMacros = nullptr; }); if (command_type == "CheckCommand") { diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 0a6785b84..b72e2f0b3 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -15,7 +15,7 @@ using namespace icinga; -thread_local Dictionary::Ptr MacroResolver::overrideMacros; +thread_local Dictionary::Ptr MacroResolver::OverrideMacros; Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolvers, const CheckResult::Ptr& cr, String *missingMacro, diff --git a/lib/icinga/macroresolver.hpp b/lib/icinga/macroresolver.hpp index 65dc69679..62cd41d3c 100644 --- a/lib/icinga/macroresolver.hpp +++ b/lib/icinga/macroresolver.hpp @@ -21,7 +21,7 @@ class MacroResolver public: DECLARE_PTR_TYPEDEFS(MacroResolver); - static thread_local Dictionary::Ptr overrideMacros; + static thread_local Dictionary::Ptr OverrideMacros; virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const = 0; }; diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp index 68458d3d9..70523b49f 100644 --- a/lib/methods/pluginchecktask.cpp +++ b/lib/methods/pluginchecktask.cpp @@ -29,8 +29,8 @@ void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes tie(host, service) = GetHostService(checkable); MacroProcessor::ResolverList resolvers; - if (MacroResolver::overrideMacros) - resolvers.emplace_back("override", MacroResolver::overrideMacros); + if (MacroResolver::OverrideMacros) + resolvers.emplace_back("override", MacroResolver::OverrideMacros); if (service) resolvers.emplace_back("service", service);