diff --git a/cib/cib.cpp b/cib/cib.cpp index f2d3e6339..7c668ce32 100644 --- 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 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(); - 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 88a852060..98a5db52d 100644 --- 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 OnServiceStatusUpdate; private: - static int m_Types; - static RingBuffer m_TaskStatistics; }; diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp index f4355efc3..4ef7dda1a 100644 --- 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 c6367e1e9..362cc24f9 100644 --- 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 64d0e2021..bb34a24af 100644 --- 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 3e2adc0f3..3d6ecc943 100644 --- 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); } /**