custom attr: move into DynamicObject using GetCustom()

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index 683d8dd8a067f54dd07af83c8a15f6f5af0e5489..695a9f624914cf652a8015200d9acd19a0a40fc9 100644 (file)
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -624,7 +624,7 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
 
 void CompatComponent::DumpCustomAttributes(std::ostream& fp, const DynamicObject::Ptr& object)
 {
-       Dictionary::Ptr custom = object->Get("custom");
+       Dictionary::Ptr custom = object->GetCustom();
 
        if (!custom)
                return;

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index ed38d13223fdce6705226e38bec346fcd4b1b3a6..6482a8b059b41669b85ab984c1de6f0320aaba48 100644 (file)
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -56,6 +56,7 @@ DynamicObject::DynamicObject(const Dictionary::Ptr& serializedObject)
        RegisterAttribute("__local", Attribute_Config, &m_Local);
        RegisterAttribute("__source", Attribute_Local, &m_Source);
        RegisterAttribute("methods", Attribute_Config, &m_Methods);
+       RegisterAttribute("custom", Attribute_Config, &m_Custom);
 
        if (!serializedObject->Contains("configTx"))
                BOOST_THROW_EXCEPTION(std::invalid_argument("Serialized object must contain a config snapshot."));
@@ -616,3 +617,8 @@ const DynamicObject::AttributeMap& DynamicObject::GetAttributes(void) const
 
        return m_Attributes;
 }
+
+Dictionary::Ptr DynamicObject::GetCustom(void) const
+{
+       return m_Custom;
+}

diff --git a/lib/base/dynamicobject.h b/lib/base/dynamicobject.h
index 1308ab0a24d5b0cf5fd76a4dc84825fd179a5c5d..2b3e452d3436f8d3400e1c79fa8e5f18bd876354 100644 (file)
--- a/lib/base/dynamicobject.h
+++ b/lib/base/dynamicobject.h
@@ -101,6 +101,8 @@ public:
 
        static double GetCurrentTx(void);
 
+       Dictionary::Ptr GetCustom(void) const;
+
 protected:
        explicit DynamicObject(const Dictionary::Ptr& serializedObject);
 
@@ -125,6 +127,7 @@ private:
        Attribute<bool> m_Local;
        Attribute<String> m_Source;
        Attribute<Dictionary::Ptr> m_Methods;
+       Attribute<Dictionary::Ptr> m_Custom;
 
        bool m_Registered;      /**< protected by the type mutex */
 

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 8ca6738d0a935c8035cd938db4ba21ef845619f7..d41de5553a7c4e8245873b9a37a2f59f81fe0ee1 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -51,7 +51,6 @@ Host::Host(const Dictionary::Ptr& serializedUpdate)
        RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
        RegisterAttribute("hostgroups", Attribute_Config, &m_HostGroups);
        RegisterAttribute("macros", Attribute_Config, &m_Macros);
-       RegisterAttribute("custom", Attribute_Config, &m_Custom);
        RegisterAttribute("hostdependencies", Attribute_Config, &m_HostDependencies);
        RegisterAttribute("servicedependencies", Attribute_Config, &m_ServiceDependencies);
        RegisterAttribute("hostcheck", Attribute_Config, &m_HostCheck);
@@ -105,11 +104,6 @@ Dictionary::Ptr Host::GetMacros(void) const
        return m_Macros;
 }
 
-Dictionary::Ptr Host::GetCustom(void) const
-{
-       return m_Custom;
-}
-
 Array::Ptr Host::GetHostDependencies(void) const
 {
        return m_HostDependencies;;

diff --git a/lib/icinga/host.h b/lib/icinga/host.h
index 954380ee16c1c338cd3ea47b40337a48aad5b917..85b6469a8c07bd5187049052eb51ab71d6dc5f74 100644 (file)
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.h
@@ -88,7 +88,6 @@ public:
        Array::Ptr GetGroups(void) const;
 
        Dictionary::Ptr GetMacros(void) const;
-       Dictionary::Ptr GetCustom(void) const;
        Array::Ptr GetHostDependencies(void) const;
        Array::Ptr GetServiceDependencies(void) const;
        String GetHostCheck(void) const;
@@ -128,7 +127,6 @@ private:
        Attribute<String> m_DisplayName;
        Attribute<Array::Ptr> m_HostGroups;
        Attribute<Dictionary::Ptr> m_Macros;
-       Attribute<Dictionary::Ptr> m_Custom;
        Attribute<Array::Ptr> m_HostDependencies;
        Attribute<Array::Ptr> m_ServiceDependencies;
        Attribute<String> m_HostCheck;

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index f70e29a361d3fe26cdb839fcdde0978b8be79b18..495e52d8970558473d20f71f256ff03348e42280 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -44,7 +44,6 @@ Service::Service(const Dictionary::Ptr& serializedObject)
 
        RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
        RegisterAttribute("macros", Attribute_Config, &m_Macros);
-       RegisterAttribute("custom", Attribute_Config, &m_Custom);
        RegisterAttribute("hostdependencies", Attribute_Config, &m_HostDependencies);
        RegisterAttribute("servicedependencies", Attribute_Config, &m_ServiceDependencies);
        RegisterAttribute("servicegroups", Attribute_Config, &m_ServiceGroups);
@@ -167,11 +166,6 @@ Dictionary::Ptr Service::GetMacros(void) const
        return m_Macros;
 }
 
-Dictionary::Ptr Service::GetCustom(void) const
-{
-       return m_Custom;
-}
-
 Array::Ptr Service::GetHostDependencies(void) const
 {
        return m_HostDependencies;

diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index 1535947027879552bd40aeee3b530303742fbe30..9da59e9dde738dab344315235e5fd7498ff30928 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -112,7 +112,6 @@ public:
        String GetDisplayName(void) const;
        Host::Ptr GetHost(void) const;
        Dictionary::Ptr GetMacros(void) const;
-       Dictionary::Ptr GetCustom(void) const;
        Array::Ptr GetHostDependencies(void) const;
        Array::Ptr GetServiceDependencies(void) const;
        Array::Ptr GetGroups(void) const;
@@ -311,7 +310,6 @@ private:
 
        Attribute<String> m_DisplayName;
        Attribute<Dictionary::Ptr> m_Macros;
-       Attribute<Dictionary::Ptr> m_Custom;
        Attribute<Array::Ptr> m_HostDependencies;
        Attribute<Array::Ptr> m_ServiceDependencies;
        Attribute<Array::Ptr> m_ServiceGroups;