Moved OnCheckResultReceived signal to the Service class.

diff --git a/cib/cib.cpp b/cib/cib.cpp
index c4ee26f2b797b9c2143c5420c05eb6aa32528086..ef4c3bdcaf3c09f2cff1097f12b6fb8c30b36615 100644 (file)
--- a/cib/cib.cpp
+++ b/cib/cib.cpp
@@ -22,7 +22,6 @@
 using namespace icinga;
 
 RingBuffer CIB::m_TaskStatistics(15 * 60);
-boost::signal<void (const CheckResultMessage&)> CIB::OnCheckResultReceived;
 
 void CIB::UpdateTaskStatistics(long tv, int num)
 {

diff --git a/cib/cib.h b/cib/cib.h
index f371153d84031f8c5835b62137b43b419bea1fcb..c64fb89a6c59f3ac135b22808f1a67c6012c6f37 100644 (file)
--- a/cib/cib.h
+++ b/cib/cib.h
@@ -29,8 +29,6 @@ public:
        static void UpdateTaskStatistics(long tv, int num);
        static int GetTaskStatistics(long timespan);
 
-       static boost::signal<void (const CheckResultMessage&)> OnCheckResultReceived;
-
 private:
        static RingBuffer m_TaskStatistics;
 };

diff --git a/cib/service.cpp b/cib/service.cpp
index 9f05eedda7c597887dbd676a1b4f4aa27c612de9..bb22de639fa14ffb1d0736556d8356874cc40799 100644 (file)
--- a/cib/service.cpp
+++ b/cib/service.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+boost::signal<void (Service, const CheckResultMessage&)> Service::OnCheckResultReceived;
+
 Service::Service(const ConfigObject::Ptr& configObject)
        : ConfigObjectAdapter(configObject)
 {

diff --git a/cib/service.h b/cib/service.h
index f2c58fe64a990c9ba9e776d38427cfc5712ba635..cc95758e1ed667a9905f783c9e85554835e6525c 100644 (file)
--- a/cib/service.h
+++ b/cib/service.h
@@ -39,6 +39,7 @@ enum ServiceStateType
 };
 
 class CheckResult;
+class CheckResultMessage;
 class ServiceStatusMessage;
 
 class I2_CIB_API Service : public ConfigObjectAdapter
@@ -103,6 +104,8 @@ public:
        static string StateTypeToString(ServiceStateType state);
 
        static Dictionary::Ptr ResolveDependencies(Host host, const Dictionary::Ptr& dependencies);
+
+       static boost::signal<void (Service service, const CheckResultMessage&)> OnCheckResultReceived;
 };
 
 }

diff --git a/components/cibsync/cibsynccomponent.cpp b/components/cibsync/cibsynccomponent.cpp
index 4d7aecda6a13058a1dbdca965e4dc98a405c976e..44113a5c2d8c7a5570906d49c22ccf50694e0c00 100644 (file)
--- a/components/cibsync/cibsynccomponent.cpp
+++ b/components/cibsync/cibsynccomponent.cpp
@@ -93,7 +93,7 @@ void CIBSyncComponent::CheckResultRequestHandler(const Endpoint::Ptr& sender, co
        if (!params.GetCheckResult(&cr))
                return;
 
-       CIB::OnCheckResultReceived(params);
+       Service::OnCheckResultReceived(service, params);
        service.ApplyCheckResult(cr);
 
        time_t now = Utility::GetTime();