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

Bugfixes.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-07-02 15:48:49 +02:00
parent 9a0cae862a
commit 1b421d0cc0
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cib/cib.cpp
View File

@ -33,3 +33,4 @@ int CIB::GetInformationTypes(void)
{ {
return m_Types; return m_Types;
} }

4
components/cibsync/cibsynccomponent.h
View File

@ -35,11 +35,10 @@ public:
private: private:
VirtualEndpoint::Ptr m_Endpoint; VirtualEndpoint::Ptr m_Endpoint;
bool m_SyncingConfig;
static void ServiceStatusRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request); static void ServiceStatusRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
bool m_SyncingConfig;
void NewEndpointHandler(const Endpoint::Ptr& endpoint); void NewEndpointHandler(const Endpoint::Ptr& endpoint);
void SessionEstablishedHandler(const Endpoint::Ptr& endpoint); void SessionEstablishedHandler(const Endpoint::Ptr& endpoint);
@ -54,7 +53,6 @@ private:
string method, bool includeProperties); string method, bool includeProperties);
static bool ShouldReplicateObject(const ConfigObject::Ptr& object); static bool ShouldReplicateObject(const ConfigObject::Ptr& object);
}; };
} }

8
components/compat/compatcomponent.cpp
View File

@ -112,6 +112,11 @@ void CompatComponent::DumpServiceStatus(ofstream& fp, Service service)
long execution_time = (execution_end - execution_start); long execution_time = (execution_end - execution_start);
long latency = (schedule_end - schedule_start) - execution_time; long latency = (schedule_end - schedule_start) - execution_time;
int state = service.GetState();
if (state >= StateUnknown)
state = StateUnknown;
fp << "servicestatus {" << "\n" fp << "servicestatus {" << "\n"
<< "\t" << "host_name=" << service.GetHost().GetName() << "\n" << "\t" << "host_name=" << service.GetHost().GetName() << "\n"
<< "\t" << "service_description=" << service.GetAlias() << "\n" << "\t" << "service_description=" << service.GetAlias() << "\n"
@ -121,7 +126,7 @@ void CompatComponent::DumpServiceStatus(ofstream& fp, Service service)
<< "\t" << "should_be_scheduled=1" << "\n" << "\t" << "should_be_scheduled=1" << "\n"
<< "\t" << "check_execution_time=" << execution_time << "\n" << "\t" << "check_execution_time=" << execution_time << "\n"
<< "\t" << "check_latency=" << latency << "\n" << "\t" << "check_latency=" << latency << "\n"
<< "\t" << "current_state=" << service.GetState() << "\n" << "\t" << "current_state=" << state << "\n"
<< "\t" << "state_type=" << service.GetStateType() << "\n" << "\t" << "state_type=" << service.GetStateType() << "\n"
<< "\t" << "plugin_output=" << output << "\n" << "\t" << "plugin_output=" << output << "\n"
<< "\t" << "performance_data=" << perfdata << "\n" << "\t" << "performance_data=" << perfdata << "\n"
@ -149,6 +154,7 @@ void CompatComponent::DumpServiceObject(ofstream& fp, Service service)
<< "\t" << "max_check_attempts" << "\t" << 1 << "\n" << "\t" << "max_check_attempts" << "\t" << 1 << "\n"
<< "\t" << "active_checks_enabled" << "\t" << 1 << "\n" << "\t" << "active_checks_enabled" << "\t" << 1 << "\n"
<< "\t" << "passive_checks_enabled" << "\t" << 1 << "\n" << "\t" << "passive_checks_enabled" << "\t" << 1 << "\n"
<< "\t" << "check_freshness" << "\t" << 1 << "\n"
<< "\t" << "}" << "\n" << "\t" << "}" << "\n"
<< "\n"; << "\n";
} }