tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename/Remove experimental script functions 

fixes #12332
This commit is contained in:
Gunnar Beutner 2016-08-09 09:35:16 +02:00
parent 451cd73749
commit ff293661fc
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/scriptutils.cpp
View File

@ -65,7 +65,7 @@ REGISTER_SAFE_SCRIPTFUNCTION(escape_shell_arg, &Utility::EscapeShellArg);
#ifdef _WIN32 #ifdef _WIN32
REGISTER_SAFE_SCRIPTFUNCTION(escape_create_process_arg, &Utility::EscapeCreateProcessArg); REGISTER_SAFE_SCRIPTFUNCTION(escape_create_process_arg, &Utility::EscapeCreateProcessArg);
#endif /* _WIN32 */ #endif /* _WIN32 */
REGISTER_SCRIPTFUNCTION(__ptr, &ScriptUtils::Ptr); REGISTER_SCRIPTFUNCTION(ptr, &ScriptUtils::Ptr);
String ScriptUtils::CastString(const Value& value) String ScriptUtils::CastString(const Value& value)
{ {

4
lib/config/configitem.cpp
View File

@ -46,7 +46,9 @@ ConfigItem::TypeMap ConfigItem::m_Items;
ConfigItem::ItemList ConfigItem::m_UnnamedItems; ConfigItem::ItemList ConfigItem::m_UnnamedItems;
ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems; ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems;
#ifdef I2_DEBUG
REGISTER_SCRIPTFUNCTION(__run_with_activation_context, &ConfigItem::RunWithActivationContext); REGISTER_SCRIPTFUNCTION(__run_with_activation_context, &ConfigItem::RunWithActivationContext);
#endif /* I2_DEBUG */
/** /**
* Constructor for the ConfigItem class. * Constructor for the ConfigItem class.
@ -612,6 +614,7 @@ bool ConfigItem::ActivateItems(WorkQueue& upq, const std::vector<ConfigItem::Ptr
return true; return true;
} }
#ifdef I2_DEBUG
bool ConfigItem::RunWithActivationContext(const Function::Ptr& function) bool ConfigItem::RunWithActivationContext(const Function::Ptr& function)
{ {
ActivationScope scope; ActivationScope scope;
@ -634,6 +637,7 @@ bool ConfigItem::RunWithActivationContext(const Function::Ptr& function)
return true; return true;
} }
#endif /* I2_DEBUG */
std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type) std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type)
{ {

2
lib/config/configitem.hpp
View File

@ -71,7 +71,9 @@ public:
static bool CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems); static bool CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems);
static bool ActivateItems(WorkQueue& upq, const std::vector<ConfigItem::Ptr>& newItems, bool runtimeCreated = false); static bool ActivateItems(WorkQueue& upq, const std::vector<ConfigItem::Ptr>& newItems, bool runtimeCreated = false);
#ifdef I2_DEBUG
static bool RunWithActivationContext(const Function::Ptr& function); static bool RunWithActivationContext(const Function::Ptr& function);
#endif /* I2_DEBUG */
static std::vector<ConfigItem::Ptr> GetItems(const String& type); static std::vector<ConfigItem::Ptr> GetItems(const String& type);