diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index 84e8846f1..a45c44cec 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -224,7 +224,6 @@ void Host::UpdateSlaveServices(void) keys.insert("check_interval"); keys.insert("retry_interval"); keys.insert("servicegroups"); - keys.insert("checkers"); keys.insert("notification_interval"); keys.insert("notification_type_filter"); keys.insert("notification_state_filter"); diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp index 2db175169..679cbd4aa 100644 --- a/lib/icinga/service-check.cpp +++ b/lib/icinga/service-check.cpp @@ -82,11 +82,6 @@ double Service::GetRetryInterval(void) const return m_RetryInterval; } -Array::Ptr Service::GetCheckers(void) const -{ - return m_Checkers; -} - void Service::SetSchedulingOffset(long offset) { m_SchedulingOffset = offset; @@ -689,23 +684,6 @@ String Service::StateTypeToString(StateType type) return "HARD"; } -bool Service::IsAllowedChecker(const String& checker) const -{ - Array::Ptr checkers = GetCheckers(); - - if (!checkers) - return true; - - ObjectLock olock(checkers); - - BOOST_FOREACH(const Value& pattern, checkers) { - if (Utility::Match(pattern, checker)) - return true; - } - - return false; -} - void Service::ExecuteCheck(void) { ASSERT(!OwnsLock()); diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index 5a526d55e..d12bef569 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -416,7 +416,6 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) bag->Set("check_period", m_CheckPeriod); bag->Set("check_interval", m_CheckInterval); bag->Set("retry_interval", m_RetryInterval); - bag->Set("checkers", m_Checkers); bag->Set("event_command", m_EventCommand); bag->Set("volatile", m_Volatile); bag->Set("short_name", m_ShortName); @@ -475,7 +474,6 @@ void Service::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes m_CheckPeriod = bag->Get("check_period"); m_CheckInterval = bag->Get("check_interval"); m_RetryInterval = bag->Get("retry_interval"); - m_Checkers = bag->Get("checkers"); m_EventCommand = bag->Get("event_command"); m_Volatile = bag->Get("volatile"); m_ShortName = bag->Get("short_name"); diff --git a/lib/icinga/service.h b/lib/icinga/service.h index b56177cd7..9b17829db 100644 --- a/lib/icinga/service.h +++ b/lib/icinga/service.h @@ -143,7 +143,6 @@ public: void ClearAcknowledgement(const String& authority = String()); /* Checks */ - Array::Ptr GetCheckers(void) const; shared_ptr GetCheckCommand(void) const; long GetMaxCheckAttempts(void) const; TimePeriod::Ptr GetCheckPeriod(void) const; @@ -160,8 +159,6 @@ public: void SetCurrentChecker(const String& checker); String GetCurrentChecker(void) const; - bool IsAllowedChecker(const String& checker) const; - void SetCurrentCheckAttempt(long attempt); long GetCurrentCheckAttempt(void) const; @@ -358,7 +355,6 @@ private: Value m_CheckInterval; Value m_RetryInterval; double m_NextCheck; - Array::Ptr m_Checkers; String m_CurrentChecker; Value m_CheckAttempt; Value m_State;