Module: check_mk
Branch: master
Commit: 91600043ceec1910e35b89996460ab536303dd84
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91600043ceec19…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Nov 6 10:45:37 2017 +0100
Unify TimeperiodColumn implementations.
Change-Id: I3138e352537e2a30483b6c2974310d54212d2156
---
livestatus/src/TimeperiodColumn.cc | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/livestatus/src/TimeperiodColumn.cc b/livestatus/src/TimeperiodColumn.cc
index 5488d27..6986acd 100644
--- a/livestatus/src/TimeperiodColumn.cc
+++ b/livestatus/src/TimeperiodColumn.cc
@@ -24,10 +24,13 @@
#include "TimeperiodColumn.h"
#include "Row.h"
+
+#ifdef CMC
+#include "Timeperiod.h"
+#else
#include "TimeperiodsCache.h"
#include "nagios.h"
-
-extern TimeperiodsCache* g_timeperiods_cache;
+#endif
TimeperiodColumn::TimeperiodColumn(const std::string& name,
const std::string& description,
@@ -38,9 +41,16 @@ TimeperiodColumn::TimeperiodColumn(const std::string& name,
int32_t TimeperiodColumn::getValue(Row row,
const contact* /* auth_user */) const {
+#ifdef CMC
+ if (auto tp = columnData<Timeperiod>(row)) {
+ return tp->isActive() ? 1 : 0;
+ }
+#else
+ extern TimeperiodsCache* g_timeperiods_cache;
if (auto tp = columnData<timeperiod>(row)) {
return g_timeperiods_cache->inTimeperiod(tp) ? 1 : 0;
}
- // no timeperiod set -> Nagios assumes 24X7
+#endif
+ // no timeperiod set -> assume 24X7
return 0;
}