Removed CIB::RequireInformation.

diff --git a/cib/cib.cpp b/cib/cib.cpp
index f2d3e633944a36391cffd8d521e87840852b02e2..7c668ce32cbf5af5f125af01b47244745b5beeed 100644 (file)
--- a/cib/cib.cpp
+++ b/cib/cib.cpp
@@ -21,27 +21,9 @@
 
 using namespace icinga;
 
-int CIB::m_Types;
 RingBuffer CIB::m_TaskStatistics(15 * 60);
 boost::signal<void (const ServiceStatusMessage&)> CIB::OnServiceStatusUpdate;
 
-void CIB::RequireInformation(InformationType types)
-{
-       m_Types |= types;
-
-       Application::Ptr app = Application::GetInstance();
-       Component::Ptr component = app->GetComponent("cibsync");
-
-       if (!component) {
-               ConfigItemBuilder::Ptr cb = boost::make_shared<ConfigItemBuilder>();
-               cb->SetType("component");
-               cb->SetName("cibsync");
-               cb->SetLocal(true);
-               ConfigItem::Ptr ci = cb->Compile();
-               ci->Commit();
-       }
-}
-
 void CIB::UpdateTaskStatistics(long tv, int num)
 {
        m_TaskStatistics.InsertValue(tv, num);
@@ -51,9 +33,3 @@ int CIB::GetTaskStatistics(long timespan)
 {
        return m_TaskStatistics.GetValues(timespan);
 }
-
-int CIB::GetInformationTypes(void)
-{
-       return m_Types;
-}
-

diff --git a/cib/cib.h b/cib/cib.h
index 88a8520606c529c4713206b4e7b76a62ffed4fc0..98a5db52d0446a03a733d19f45201d63d0cc6f61 100644 (file)
--- a/cib/cib.h
+++ b/cib/cib.h
@@ -23,27 +23,15 @@
 namespace icinga
 {
 
-enum InformationType
-{
-       CIB_Configuration = 1<<0,
-       CIB_ProgramStatus = 1<<1,
-       CIB_ServiceStatus = 1<<2
-};
-
 class I2_CIB_API CIB
 {
 public:
-       static void RequireInformation(InformationType type);
-       static int GetInformationTypes(void);
-
        static void UpdateTaskStatistics(long tv, int num);
        static int GetTaskStatistics(long timespan);
 
        static boost::signal<void (const ServiceStatusMessage&)> OnServiceStatusUpdate;
 
 private:
-       static int m_Types;
-
        static RingBuffer m_TaskStatistics;
 };
 

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index f4355efc3393a7a2a87e892602709cb44e1649fa..4ef7dda1ae27cddcb372f7980d149c40db30d857 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -48,9 +48,6 @@ void CheckerComponent::Start(void)
        m_ResultTimer->SetInterval(5);
        m_ResultTimer->OnTimerExpired.connect(boost::bind(&CheckerComponent::ResultTimerHandler, this));
        m_ResultTimer->Start();
-
-       CIB::RequireInformation(CIB_Configuration);
-       CIB::RequireInformation(CIB_ServiceStatus);
 }
 
 void CheckerComponent::Stop(void)

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index c6367e1e98a9a6fc9e7ae8d5769d025b76e179ab..362cc24f9146560214e6ffa568a2bbb450838727 100644 (file)
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -47,10 +47,6 @@ void CompatComponent::Start(void)
        m_StatusTimer->OnTimerExpired.connect(boost::bind(&CompatComponent::StatusTimerHandler, this));
        m_StatusTimer->Start();
        m_StatusTimer->Reschedule(0);
-
-       CIB::RequireInformation(CIB_Configuration);
-       CIB::RequireInformation(CIB_ProgramStatus);
-       CIB::RequireInformation(CIB_ServiceStatus);
 }
 
 /**

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index 64d0e20210cffe5310029f48f82184c8b5e30c3d..bb34a24af0910536e730d50defad664d0b76e0e8 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -49,8 +49,6 @@ void DelegationComponent::Start(void)
        EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
        EndpointManager::GetInstance()->OnNewEndpoint.connect(bind(&DelegationComponent::NewEndpointHandler, this, _2));
-
-       CIB::RequireInformation(CIB_Configuration);
 }
 
 void DelegationComponent::Stop(void)

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index 3e2adc0f3eeef235ada9a76cd4765d47580e48df..3d6ecc943defe135e40b5ae03960776781363299 100644 (file)
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -62,8 +62,6 @@ void DiscoveryComponent::Start(void)
 
        /* call the timer as soon as possible */
        m_DiscoveryTimer->Reschedule(0);
-
-       CIB::RequireInformation(CIB_Configuration);
 }
 
 /**