Module: check_mk
Branch: master
Commit: ec997e979fc8850633e478f14562a8e538db02f9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec997e979fc885…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Apr 11 11:38:37 2016 +0200
Fetched livestatus from downstream.
---
livestatus/src/TableLog.cc | 2 --
livestatus/src/TableLog.h | 3 ---
livestatus/src/TableStateHistory.h | 10 +++-------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc
index 9d5be95..556bace 100644
--- a/livestatus/src/TableLog.cc
+++ b/livestatus/src/TableLog.cc
@@ -142,8 +142,6 @@ TableLog::TableLog() {
reinterpret_cast<char *>(ref));
}
-TableLog::~TableLog() = default;
-
void TableLog::answerQuery(Query *query) {
lock_guard<mutex> lg(g_store->logCache()->_lock);
g_store->logCache()->logCachePreChecks();
diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h
index 8a2c00b..7f3a9de 100644
--- a/livestatus/src/TableLog.h
+++ b/livestatus/src/TableLog.h
@@ -36,12 +36,9 @@ class Query;
class TableLog : public Table {
public:
TableLog();
- ~TableLog();
const char *name() override { return "log"; }
const char *prefixname() override { return "logs"; }
bool isAuthorized(contact *ctc, void *data) override;
- void handleNewMessage(Logfile *logfile, time_t since, time_t until,
- unsigned logclasses);
void answerQuery(Query *query) override;
Column *column(const char *colname) override;
diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h
index 323c089..934af6a 100644
--- a/livestatus/src/TableStateHistory.h
+++ b/livestatus/src/TableStateHistory.h
@@ -26,7 +26,6 @@
#define TableStateHistory_h
#include "config.h" // IWYU pragma: keep
-#include <time.h>
#include <map>
#include <string>
#include "LogCache.h"
@@ -54,7 +53,6 @@ class TableStateHistory : public Table {
_logfiles_t::iterator _it_logs;
logfile_entries_t *_entries;
logfile_entries_t::iterator _it_entries;
- LogEntry *_current_entry;
protected:
bool _abort_query;
@@ -64,18 +62,16 @@ public:
const char *name() override { return "statehist"; }
const char *prefixname() override { return "statehist_"; }
bool isAuthorized(contact *ctc, void *data) override;
- void handleNewMessage(Logfile *logfile, time_t since, time_t until,
- unsigned logclasses);
void answerQuery(Query *query) override;
Column *column(const char *colname) override;
- int updateHostServiceState(Query *query, const LogEntry *entry,
- HostServiceState *hs_state,
- const bool only_update);
private:
LogEntry *getPreviousLogentry();
LogEntry *getNextLogentry();
void process(Query *query, HostServiceState *hs_state);
+ int updateHostServiceState(Query *query, const LogEntry *entry,
+ HostServiceState *hs_state,
+ const bool only_update);
};
#endif // TableStateHistory_h