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

Removed the native:: prefix for built-in functions.

This commit is contained in:
Gunnar Beutner 2013-02-15 12:41:32 +01:00
parent 3ee1dbc94c
commit efd108982a
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itl/notification.conf
View File

@ -19,6 +19,6 @@
abstract object Notification "plugin-notification" { abstract object Notification "plugin-notification" {
methods = { methods = {
notify = "native::PluginNotification" notify = "PluginNotification"
} }
} }

4
itl/service.conf
View File

@ -27,12 +27,12 @@ abstract object Service "itl-service" {
abstract object Service "null-service" inherits "itl-service" { abstract object Service "null-service" inherits "itl-service" {
methods = { methods = {
check = "native::NullCheck" check = "NullCheck"
} }
} }
abstract object Service "plugin-service" inherits "itl-service" { abstract object Service "plugin-service" inherits "itl-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

4
itl/types.conf
View File

@ -31,7 +31,7 @@ type DynamicObject {
%attribute string "__type", %attribute string "__type",
%attribute dictionary "methods" { %attribute dictionary "methods" {
%validator "native::ValidateMethods", %validator "ValidateMethods",
%attribute string "*", %attribute string "*",
}, },
@ -68,7 +68,7 @@ type Host {
} }
}, },
%attribute dictionary "services" { %attribute dictionary "services" {
%validator "native::ValidateServiceDictionary", %validator "ValidateServiceDictionary",
%attribute string "*", %attribute string "*",
%attribute dictionary "*" { %attribute dictionary "*" {

2
lib/config/configtype.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION("native::ValidateMethods", &ConfigType::ValidateMethods); REGISTER_SCRIPTFUNCTION("ValidateMethods", &ConfigType::ValidateMethods);
ConfigType::ConfigType(const String& name, const DebugInfo& debuginfo) ConfigType::ConfigType(const String& name, const DebugInfo& debuginfo)
: m_Name(name), m_RuleList(boost::make_shared<TypeRuleList>()), m_DebugInfo(debuginfo) : m_Name(name), m_RuleList(boost::make_shared<TypeRuleList>()), m_DebugInfo(debuginfo)

2
lib/icinga/host.cpp
View File

@ -24,7 +24,7 @@ using namespace icinga;
map<String, map<String, weak_ptr<Service> > > Host::m_ServicesCache; map<String, map<String, weak_ptr<Service> > > Host::m_ServicesCache;
bool Host::m_ServicesCacheValid = true; bool Host::m_ServicesCacheValid = true;
REGISTER_SCRIPTFUNCTION("native::ValidateServiceDictionary", &Host::ValidateServiceDictionary); REGISTER_SCRIPTFUNCTION("ValidateServiceDictionary", &Host::ValidateServiceDictionary);
static AttributeDescription hostAttributes[] = { static AttributeDescription hostAttributes[] = {
{ "slave_services", Attribute_Transient } { "slave_services", Attribute_Transient }

2
lib/icinga/nullchecktask.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION("native::NullCheck", &NullCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION("NullCheck", &NullCheckTask::ScriptFunc);
void NullCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Value>& arguments) void NullCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Value>& arguments)
{ {

2
lib/icinga/pluginnotificationtask.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION("native::PluginNotification", &PluginNotificationTask::ScriptFunc); REGISTER_SCRIPTFUNCTION("PluginNotification", &PluginNotificationTask::ScriptFunc);
PluginNotificationTask::PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process, PluginNotificationTask::PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process,
const String& service, const String& command) const String& service, const String& command)