[checkmk-commits] Check_MK Git: check_mk: Livestatus: tried to fix timeperiod problem

Module: check_mk Branch: master Commit: 7b62855f7817216263cd04f535df53b7d3044ef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b62855f781721… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 16:54:20 2011 +0200 Livestatus: tried to fix timeperiod problem --- livestatus/src/TimeperiodsCache.cc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 96007ec..b00815a 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -56,11 +56,13 @@ void TimeperiodsCache::update(time_t now) return; } - _cache_time = minutes; - // Loop over all timeperiods and compute if we are - // currently in + // currently in. Detect the case where no time periods + // are known (yet!). This might be the case when a timed + // event broker message arrives *before* the start of the + // event loop. timeperiod *tp = timeperiod_list; + int num_periods = 0; while (tp) { bool is_in = 0 == check_time_against_period(now, tp); @@ -76,7 +78,13 @@ void TimeperiodsCache::update(time_t now) } tp = tp->next; + num_periods++; } + if (num_periods > 0) + _cache_time = minutes; + else + logger(LG_INFO, "Timeperiod cache not updated, there are no timeperiods (yet)"); + pthread_mutex_unlock(&_cache_lock); }