From 13f0a737a21b628a12e539e51ab45209da5bd1c7 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Tue, 21 Feb 2017 19:02:40 +0100 Subject: [PATCH] Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 --- pandora_console/include/functions_agents.php | 3 +-- pandora_console/include/functions_modules.php | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 8c10c447bb..7beb900349 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1405,8 +1405,7 @@ function agents_get_interval_status ($agent) { $now = time (); $diferencia = $now - $last_time; $time = ui_print_timestamp ($last_time, true, array('style' => 'font-size:6.5pt')); - $min_interval = modules_get_agentmodule_mininterval($agent['id_agente']); - + $min_interval = modules_get_agentmodule_mininterval_no_async($agent['id_agente']); $return = $time; if ($diferencia > ($min_interval["min_interval"] * 2)) $return = ''.$time.''; diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 4cc4663443..684741fe64 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -2436,4 +2436,13 @@ function modules_get_agentmodule_mininterval($id_agent) { $sql = sprintf('SELECT min(current_interval) min_interval from tagente_estado where id_agente = %d', $id_agent); return db_get_row_sql($sql); } +function modules_get_agentmodule_mininterval_no_async($id_agent) { + + $sql = 'SELECT MIN(tae.current_interval) AS min_interval + FROM tagente_estado tae + INNER JOIN tagente_modulo tam ON tae.id_agente_modulo = tam.id_agente_modulo + INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo where ttm.nombre not like "async%" and tae.id_agente = '.$id_agent; + + return db_get_row_sql($sql); +} ?>