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

livestatus: move host attribute getter into host->service again 

refs #4372
This commit is contained in:
Michael Friedrich 2013-07-05 13:42:40 +02:00
parent 03c18367ff
commit ec3e8cfe1c
3 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/livestatus/hoststable.cpp
View File

@ -176,12 +176,20 @@ Value HostsTable::DisplayNameAccessor(const Object::Ptr& object)
Value HostsTable::AddressAccessor(const Object::Ptr& object) Value HostsTable::AddressAccessor(const Object::Ptr& object)
{ {
Dictionary::Ptr macros = static_pointer_cast<Host>(object)->GetMacros(); Dictionary::Ptr macros = static_pointer_cast<Host>(object)->GetMacros();
if (!macros)
return Value();
return macros->Get("address"); return macros->Get("address");
} }
Value HostsTable::Address6Accessor(const Object::Ptr& object) Value HostsTable::Address6Accessor(const Object::Ptr& object)
{ {
Dictionary::Ptr macros = static_pointer_cast<Host>(object)->GetMacros(); Dictionary::Ptr macros = static_pointer_cast<Host>(object)->GetMacros();
if (!macros)
return Value();
return macros->Get("address6"); return macros->Get("address6");
} }
@ -443,6 +451,7 @@ Value HostsTable::AcknowledgementTypeAccessor(const Object::Ptr& object)
if (!hc) if (!hc)
return Value(); return Value();
/* important: lock acknowledgements */
ObjectLock olock(hc); ObjectLock olock(hc);
return static_cast<int>(hc->GetAcknowledgement()); return static_cast<int>(hc->GetAcknowledgement());
@ -572,6 +581,7 @@ Value HostsTable::AcknowledgedAccessor(const Object::Ptr& object)
if (!hc) if (!hc)
return Value(); return Value();
/* important: lock acknowledgements */
ObjectLock olock(hc); ObjectLock olock(hc);
return (hc->IsAcknowledged() ? 1 : 0); return (hc->IsAcknowledged() ? 1 : 0);
@ -601,7 +611,13 @@ Value HostsTable::CheckFlappingRecoveryNotificationAccessor(const Object::Ptr& o
Value HostsTable::LastCheckAccessor(const Object::Ptr& object) Value HostsTable::LastCheckAccessor(const Object::Ptr& object)
{ {
return static_pointer_cast<Host>(object)->GetLastCheck(); /* use hostcheck service */
Service::Ptr hc = static_pointer_cast<Host>(object)->GetHostCheckService();
if (!hc)
return Value();
return hc->GetLastCheck();
} }
Value HostsTable::LastStateChangeAccessor(const Object::Ptr& object) Value HostsTable::LastStateChangeAccessor(const Object::Ptr& object)
@ -629,12 +645,24 @@ Value HostsTable::LastTimeUnreachableAccessor(const Object::Ptr& object)
Value HostsTable::IsFlappingAccessor(const Object::Ptr& object) Value HostsTable::IsFlappingAccessor(const Object::Ptr& object)
{ {
return static_pointer_cast<Host>(object)->IsFlapping(); /* use hostcheck service */
Service::Ptr hc = static_pointer_cast<Host>(object)->GetHostCheckService();
if (!hc)
return Value();
return hc->IsFlapping();
} }
Value HostsTable::ScheduledDowntimeDepthAccessor(const Object::Ptr& object) Value HostsTable::ScheduledDowntimeDepthAccessor(const Object::Ptr& object)
{ {
return static_pointer_cast<Host>(object)->GetDowntimeDepth(); /* use hostcheck service */
Service::Ptr hc = static_pointer_cast<Host>(object)->GetHostCheckService();
if (!hc)
return Value();
return hc->GetDowntimeDepth();
} }
Value HostsTable::IsExecutingAccessor(const Object::Ptr& object) Value HostsTable::IsExecutingAccessor(const Object::Ptr& object)

30
lib/icinga/host.cpp
View File

@ -610,36 +610,6 @@ StateType Host::GetStateType(void) const
return hc->GetStateType(); return hc->GetStateType();
} }
double Host::GetLastCheck(void) const
{
Service::Ptr hc = GetHostCheckService();
if (!hc)
return -1;
return hc->GetLastCheck();
}
bool Host::IsFlapping(void) const
{
Service::Ptr hc = GetHostCheckService();
if (!hc)
return false;
return hc->IsFlapping();
}
int Host::GetDowntimeDepth() const
{
Service::Ptr hc = GetHostCheckService();
if (!hc)
return 0;
return hc->GetDowntimeDepth();
}
String Host::StateToString(HostState state) String Host::StateToString(HostState state)
{ {
switch (state) { switch (state) {

9
lib/icinga/host.h
View File

@ -118,18 +118,9 @@ public:
double GetLastStateChange(void) const; double GetLastStateChange(void) const;
double GetLastHardStateChange(void) const; double GetLastHardStateChange(void) const;
bool IsFlapping(void) const;
static String StateToString(HostState state); static String StateToString(HostState state);
virtual bool ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const; virtual bool ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const;
/* Virtual Checks */
double GetLastCheck(void) const;
/* Virtual Downtime */
int GetDowntimeDepth(void) const;
protected: protected:
virtual void OnRegistrationCompleted(void); virtual void OnRegistrationCompleted(void);
virtual void OnAttributeChanged(const String& name); virtual void OnAttributeChanged(const String& name);