tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use named variables instead of hard-coded constants.

This commit is contained in:
Gunnar Beutner 2012-09-03 12:48:20 +02:00
parent 4f39e10a05
commit eba470db3e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cib/service.cpp
View File

@ -23,6 +23,11 @@ using namespace icinga;
REGISTER_CLASS(Service);
const int Service::DefaultMaxAttempts = 3;
const int Service::DefaultCheckInterval = 5 * 60;
const int Service::MinCheckInterval = 15;
const int Service::CheckIntervalDivisor = 5;
boost::signal<void (const Service::Ptr&, const CheckResultMessage&)> Service::OnCheckResultReceived;
boost::signal<void (const Service::Ptr&, const String&)> Service::OnCheckerChanged;
@ -101,7 +106,7 @@ long Service::GetMaxCheckAttempts(void) const
Value value = Get("max_check_attempts");
if (value.IsEmpty())
return 3;
return DefaultMaxCheckAttempts;
return value;
}
@ -111,10 +116,10 @@ long Service::GetCheckInterval(void) const
Value value = Get("check_interval");
if (value.IsEmpty())
return 300;
return DefaultCheckInterval;
if (value < 15)
value = 15;
if (value < MinCheckInterval)
value = MinCheckInterval;
return value;
}
@ -124,7 +129,7 @@ long Service::GetRetryInterval(void) const
Value value = Get("retry_interval");
if (value.IsEmpty())
return GetCheckInterval() / 5;
return GetCheckInterval() / CheckIntervalDivisor;
return value;
}

5
cib/service.h
View File

@ -52,6 +52,11 @@ public:
static bool Exists(const String& name);
static Service::Ptr GetByName(const String& name);
static const int DefaultMaxAttempts;
static const int DefaultCheckInterval;
static const int MinCheckInterval;
static const int CheckIntervalDivisor;
String GetAlias(void) const;
Host::Ptr GetHost(void) const;
Dictionary::Ptr GetMacros(void) const;