Modify OnVarsChanged event to pass values

refs #5219

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index ef1c99067a4bd43317ae0a3a7125e2049b0a8050..ad44f05d571bee6146087117a7bc024065f62199 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -255,6 +255,6 @@ void Checkable::SetModifiedAttributes(int flags, const MessageOrigin& origin)
 
        if ((flags & ModAttrCustomVariable) == 0) {
                SetOverrideVars(Empty);
-               OnVarsChanged(GetSelf(), origin);
+               OnVarsChanged(GetSelf(), GetVars(), origin);
        }
 }

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index 50930666a7351013bf342ee087fd7311315dfbd4..d77a5e9f9f9650888f2328f049cff78c3dbe8388 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -40,7 +40,7 @@ void Command::SetModifiedAttributes(int flags, const MessageOrigin& origin)
 {
        if ((flags & ModAttrCustomVariable) == 0) {
                SetOverrideVars(Empty);
-               OnVarsChanged(GetSelf(), origin);
+               OnVarsChanged(GetSelf(), GetVars(), origin);
        }
 }
 

diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index cdb9b59cdc940b558a0f95dea5f22ddba6bf686b..75ad2ed66a5c51ccfee0cb5609876f5b0f410163 100644 (file)
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -24,7 +24,7 @@ using namespace icinga;
 
 REGISTER_TYPE(CustomVarObject);
 
-boost::signals2::signal<void (const CustomVarObject::Ptr&, const MessageOrigin&)> CustomVarObject::OnVarsChanged;
+boost::signals2::signal<void (const CustomVarObject::Ptr&, const Dictionary::Ptr& vars, const MessageOrigin&)> CustomVarObject::OnVarsChanged;
 
 Dictionary::Ptr CustomVarObject::GetVars(void) const
 {
@@ -38,9 +38,7 @@ void CustomVarObject::SetVars(const Dictionary::Ptr& vars, const MessageOrigin&
 {
        SetOverrideVars(vars);
 
-       Log(LogNotice, "CustomVarObject", "Setting vars for object '" + GetName() + "'");
-
-       OnVarsChanged(GetSelf(), origin);
+       OnVarsChanged(GetSelf(), vars, origin);
 }
 
 int CustomVarObject::GetModifiedAttributes(void) const

diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp
index d8903b239dc16a246a53dd5f943e44af31fe3e6c..47eedce48257a1b39e43b91d400dcdfd2ab74799 100644 (file)
--- a/lib/icinga/customvarobject.hpp
+++ b/lib/icinga/customvarobject.hpp
@@ -58,8 +58,9 @@ class I2_ICINGA_API CustomVarObject : public ObjectImpl<CustomVarObject>
 {
 public:
        DECLARE_PTR_TYPEDEFS(CustomVarObject);
+       DECLARE_TYPENAME(CustomVarObject);
 
-       static boost::signals2::signal<void (const CustomVarObject::Ptr&, const MessageOrigin&)> OnVarsChanged;
+       static boost::signals2::signal<void (const CustomVarObject::Ptr&, const Dictionary::Ptr& vars, const MessageOrigin&)> OnVarsChanged;
 
        Dictionary::Ptr GetVars(void) const;
        void SetVars(const Dictionary::Ptr& vars, const MessageOrigin& origin = MessageOrigin());

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 6a2afdc87773ea53975f48bc0be99c68f27b465b..543016eac791816a46a6f6f3b5746812108d07ff 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -122,7 +122,7 @@ void User::SetModifiedAttributes(int flags, const MessageOrigin& origin)
 {
        if ((flags & ModAttrCustomVariable) == 0) {
                SetOverrideVars(Empty);
-               OnVarsChanged(GetSelf(), origin);
+               OnVarsChanged(GetSelf(), GetVars(), origin);
        }
 }