Module: check_mk Branch: master Commit: 1af63af4205cadedb3637d566d5db14c4ddd5519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af63af4205cad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 18:31:41 2013 +0200 code cleanup (eclipse tabs...) --- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 43 +++++++++++++------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 37b127d..07467a6 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -37,7 +37,7 @@ double HostSpecialDoubleColumn::getValue(void *data) switch (_type) { case HSDC_STALENESS: { - return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); + return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); } } return -1; // Never reached diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 3e135c8..205f7ff 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -36,30 +36,29 @@ double ServiceSpecialDoubleColumn::getValue(void *data) switch (_type) { case SSDC_STALENESS: { - bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); + bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); - time_t check_result_age = time(0) - svc->last_check; - service *tmp_svc; + time_t check_result_age = time(0) - svc->last_check; + service *tmp_svc; - // check_mk PASSIVE CHECK: Find check-mk service and get its check interval - if (is_cmk_passive) { - host *host = svc->host_ptr; - servicesmember *svc_member = host->services; - double check_interval = 1; - while (svc_member != 0) { - tmp_svc = svc_member->service_ptr; - if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { - check_interval = tmp_svc->check_interval * 60; - return check_result_age / check_interval; - } - svc_member = svc_member->next; - } - return 1; // Shouldnt happen! We always except check-mk service - } - else // Other non-cmk passive and active checks - { - return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); - } + // check_mk PASSIVE CHECK: Find check-mk service and get its check interval + if (is_cmk_passive) { + host *host = svc->host_ptr; + servicesmember *svc_member = host->services; + double check_interval = 1; + while (svc_member != 0) { + tmp_svc = svc_member->service_ptr; + if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { + return check_result_age / ((tmp_svc->check_interval == 0 ? 1 : tmp_svc->check_interval) * 60); + } + svc_member = svc_member->next; + } + return 1; // Shouldnt happen! We always except check-mk service + } + else // Other non-cmk passive and active checks + { + return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); + } } } return -1; // Never reached