From 7b64da51feb72175ae1b295c483439e9772c2a19 Mon Sep 17 00:00:00 2001 From: ramonn Date: Thu, 23 Feb 2012 13:01:32 +0000 Subject: [PATCH] 2012-02-23 Ramon Novoa * pandora_agent: Set the intensive interval before reading modules. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5636 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/ChangeLog | 4 ++++ pandora_agents/unix/pandora_agent | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 162d1f4c18..f91399a090 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,7 @@ +2012-02-23 Ramon Novoa + + * pandora_agent: Set the intensive interval before reading modules. + 2012-02-10 Hirofumi Kosaka * pandora_agent: Allow filename wildcards to specify diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index f2539ba3cc..f68e52bf8f 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -585,6 +585,11 @@ sub read_config (;$) { # Single value token not found. return undef; } + + # Set the intensive interval + if ($Conf{'intensive_interval'} == 0) { + $Conf{'intensive_interval'} = $Conf{'interval'}; + } # Module, plugin and collection definitions parse_conf_modules(\@file); @@ -608,11 +613,6 @@ sub read_config (;$) { $Conf{'secondary_server_opts'} = '-x \'' . $Conf{'secondary_server_pwd'} . '\' ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_pwd'} ne ''); $Conf{'secondary_server_opts'} = '-c ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_ssl'} eq 'yes'); } - - # Set the intensive interval - if ($Conf{'intensive_interval'} == 0) { - $Conf{'intensive_interval'} = $Conf{'interval'}; - } } #################################################################################