tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete code.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-12 14:12:36 +02:00
parent 102127fd5e
commit 0c64ea7f88
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/icinga/host.cpp
View File

@ -224,7 +224,6 @@ void Host::UpdateSlaveServices(void)
keys.insert("check_interval"); keys.insert("check_interval");
keys.insert("retry_interval"); keys.insert("retry_interval");
keys.insert("servicegroups"); keys.insert("servicegroups");
keys.insert("checkers");
keys.insert("notification_interval"); keys.insert("notification_interval");
keys.insert("notification_type_filter"); keys.insert("notification_type_filter");
keys.insert("notification_state_filter"); keys.insert("notification_state_filter");

22
lib/icinga/service-check.cpp
View File

@ -82,11 +82,6 @@ double Service::GetRetryInterval(void) const
return m_RetryInterval; return m_RetryInterval;
} }
Array::Ptr Service::GetCheckers(void) const
{
return m_Checkers;
}
void Service::SetSchedulingOffset(long offset) void Service::SetSchedulingOffset(long offset)
{ {
m_SchedulingOffset = offset; m_SchedulingOffset = offset;
@ -689,23 +684,6 @@ String Service::StateTypeToString(StateType type)
return "HARD"; 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) void Service::ExecuteCheck(void)
{ {
ASSERT(!OwnsLock()); ASSERT(!OwnsLock());

2
lib/icinga/service.cpp
View File

@ -416,7 +416,6 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes)
bag->Set("check_period", m_CheckPeriod); bag->Set("check_period", m_CheckPeriod);
bag->Set("check_interval", m_CheckInterval); bag->Set("check_interval", m_CheckInterval);
bag->Set("retry_interval", m_RetryInterval); bag->Set("retry_interval", m_RetryInterval);
bag->Set("checkers", m_Checkers);
bag->Set("event_command", m_EventCommand); bag->Set("event_command", m_EventCommand);
bag->Set("volatile", m_Volatile); bag->Set("volatile", m_Volatile);
bag->Set("short_name", m_ShortName); 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_CheckPeriod = bag->Get("check_period");
m_CheckInterval = bag->Get("check_interval"); m_CheckInterval = bag->Get("check_interval");
m_RetryInterval = bag->Get("retry_interval"); m_RetryInterval = bag->Get("retry_interval");
m_Checkers = bag->Get("checkers");
m_EventCommand = bag->Get("event_command"); m_EventCommand = bag->Get("event_command");
m_Volatile = bag->Get("volatile"); m_Volatile = bag->Get("volatile");
m_ShortName = bag->Get("short_name"); m_ShortName = bag->Get("short_name");

4
lib/icinga/service.h
View File

@ -143,7 +143,6 @@ public:
void ClearAcknowledgement(const String& authority = String()); void ClearAcknowledgement(const String& authority = String());
/* Checks */ /* Checks */
Array::Ptr GetCheckers(void) const;
shared_ptr<CheckCommand> GetCheckCommand(void) const; shared_ptr<CheckCommand> GetCheckCommand(void) const;
long GetMaxCheckAttempts(void) const; long GetMaxCheckAttempts(void) const;
TimePeriod::Ptr GetCheckPeriod(void) const; TimePeriod::Ptr GetCheckPeriod(void) const;
@ -160,8 +159,6 @@ public:
void SetCurrentChecker(const String& checker); void SetCurrentChecker(const String& checker);
String GetCurrentChecker(void) const; String GetCurrentChecker(void) const;
bool IsAllowedChecker(const String& checker) const;
void SetCurrentCheckAttempt(long attempt); void SetCurrentCheckAttempt(long attempt);
long GetCurrentCheckAttempt(void) const; long GetCurrentCheckAttempt(void) const;
@ -358,7 +355,6 @@ private:
Value m_CheckInterval; Value m_CheckInterval;
Value m_RetryInterval; Value m_RetryInterval;
double m_NextCheck; double m_NextCheck;
Array::Ptr m_Checkers;
String m_CurrentChecker; String m_CurrentChecker;
Value m_CheckAttempt; Value m_CheckAttempt;
Value m_State; Value m_State;