From f1f22bc3c002c44ebcc6971112ffa5570015c071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 12 Dec 2014 12:53:14 +0100 Subject: [PATCH] Bug #3378: Do not trigger host hooks for each monitorization --- src/host/HostHook.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/host/HostHook.cc b/src/host/HostHook.cc index 54e843c390..63b31d4bca 100644 --- a/src/host/HostHook.cc +++ b/src/host/HostHook.cc @@ -77,6 +77,20 @@ void HostStateMapHook::remove_host (int id) // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- +void merge_state(Host::HostState &state) +{ + if (state == Host::MONITORING_ERROR) + { + state = Host::ERROR; + } + else if (state == Host::MONITORING_DISABLED) + { + state = Host::DISABLED; + } +} + +// ----------------------------------------------------------------------------- + void HostStateHook::do_hook(void *arg) { Host * host; @@ -100,6 +114,9 @@ void HostStateHook::do_hook(void *arg) cur_state = host->get_state(); + merge_state(prev_state); + merge_state(cur_state); + if ( prev_state == cur_state ) //Still in the same state { return;