fixed call of process() when outside of query interval
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: e25ad53c495a9b077fffd621bb73838756b47b6a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e25ad53c495a9b…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 5 17:23:01 2012 +0200
livestatus: removed debug message, fixed call of process() when outside of query interval
---
livestatus/src/TableLog.cc | 2 --
livestatus/src/TableStateHistory.cc | 8 +++++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc
index db06a01..883cb59 100644
--- a/livestatus/src/TableLog.cc
+++ b/livestatus/src/TableLog.cc
@@ -143,8 +143,6 @@ void TableLog::answerQuery(Query *query)
g_store->logCache()->unlockLogCache();
return;
}
- debug_log("log classmask after %d", classmask);
-
/* This code start with the oldest log entries. I'm going
to change this and start with the newest. That way,
diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc
index 835ad16..3e90442 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -69,6 +69,7 @@ void debug_statehist(const char *loginfo, ...)
void log_hst(HostServiceState *state)
{
debug_statehist("STATE INFO");
+ debug_statehist("time %d", state->_time);
debug_statehist("state %d", state->_state);
if (state->_log_output)
debug_statehist("check_output %s", state->_log_output);
@@ -80,6 +81,9 @@ void log_hst(HostServiceState *state)
debug_statehist("host name %s", state->_host_name);
if (state->_service_description)
debug_statehist("svc description %s", state->_service_description);
+ debug_statehist("from %d", state->_from);
+ debug_statehist("until %d", state->_until);
+ debug_statehist("duration %d", state->_duration);
}
HostServiceState::~HostServiceState()
@@ -419,7 +423,9 @@ void TableStateHistory::updateHostServiceState(Query *query, const
LogEntry *ent
{
// Create existing entry for last known existance
hs_state->_until = hs_state->_last_known_time;
- process(query, hs_state);
+ if (!only_update) {
+ process(query, hs_state);
+ }
// Reanimate this host/service, cleanup any invalid data
if (hs_state->_log_output)