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

Fix formatting of execution_time, latency. 

Fixes #5427
This commit is contained in:
Michael Friedrich 2014-01-10 00:38:16 +01:00
parent 555d72150a
commit a4466ba880
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/compat/statusdatawriter.cpp
View File

@ -321,8 +321,8 @@ void StatusDataWriter::DumpServiceStatusAttrs(std::ostream& fp, const Service::P
"\t" "should_be_scheduled=" << CompatUtility::GetServiceShouldBeScheduled(service) << "\n";
if (cr) {
fp << "\t" << "check_execution_time=" << static_cast<double>(Service::CalculateExecutionTime(cr)) << "\n"
"\t" "check_latency=" << static_cast<double>(Service::CalculateLatency(cr)) << "\n";
fp << "\t" << "check_execution_time=" << Convert::ToString(Service::CalculateExecutionTime(cr)) << "\n"
"\t" "check_latency=" << Convert::ToString(Service::CalculateLatency(cr)) << "\n";
}
fp << "\t" << "current_state=" << CompatUtility::GetServiceCurrentState(service) << "\n"

4
lib/db_ido/hostdbobject.cpp
View File

@ -175,8 +175,8 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
fields->Set("percent_state_change", CompatUtility::GetServicePercentStateChange(service));
if (cr) {
fields->Set("latency", Service::CalculateLatency(cr));
fields->Set("execution_time", Service::CalculateExecutionTime(cr));
fields->Set("latency", Convert::ToString(Service::CalculateLatency(cr)));
fields->Set("execution_time", Convert::ToString(Service::CalculateExecutionTime(cr)));
}
fields->Set("scheduled_downtime_depth", service->GetDowntimeDepth());
fields->Set("failure_prediction_enabled", Empty);

8
lib/db_ido/servicedbobject.cpp
View File

@ -179,8 +179,8 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
fields->Set("percent_state_change", CompatUtility::GetServicePercentStateChange(service));
if (cr) {
fields->Set("latency", Service::CalculateLatency(cr));
fields->Set("execution_time", Service::CalculateExecutionTime(cr));
fields->Set("latency", Convert::ToString(Service::CalculateLatency(cr)));
fields->Set("execution_time", Convert::ToString(Service::CalculateExecutionTime(cr)));
}
fields->Set("scheduled_downtime_depth", service->GetDowntimeDepth());
@ -1276,8 +1276,8 @@ void ServiceDbObject::AddServiceCheckHistory(const Service::Ptr& service, const
fields1->Set("command_object_id", service->GetCheckCommand());
fields1->Set("command_args", Empty);
fields1->Set("command_line", cr->GetCommand());
fields1->Set("execution_time", execution_time);
fields1->Set("latency", Service::CalculateLatency(cr));
fields1->Set("execution_time", Convert::ToString(execution_time));
fields1->Set("latency", Convert::ToString(Service::CalculateLatency(cr)));
fields1->Set("return_code", cr->GetExitStatus());
fields1->Set("output", CompatUtility::GetCheckResultOutput(cr));
fields1->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));