Module: check_mk
Branch: master
Commit: 059fddc3b2f6a0d0ef9235f56a4269367063ba3c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=059fddc3b2f6a0…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Mar 11 09:58:52 2016 +0100
Synched with upcoming time-related core changes.
---
livestatus/src/LogCache.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc
index bc67028..3e37998 100644
--- a/livestatus/src/LogCache.cc
+++ b/livestatus/src/LogCache.cc
@@ -36,7 +36,9 @@
#include "logger.h"
#ifdef CMC
+#include <chrono>
#include "Core.h"
+using std::chrono::system_clock;
extern Core *g_core;
#else
extern time_t last_log_rotation;
@@ -97,7 +99,8 @@ bool LogCache::logCachePreChecks() {
// our file index. And delete all memorized
// log messages.
#ifdef CMC
- if (g_core->_last_logfile_rotation > _last_index_update) {
+ if (g_core->_last_logfile_rotation >
+ system_clock::from_time_t(_last_index_update)) {
#else
if (last_log_rotation > _last_index_update) {
#endif