tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-02-23 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
Ramon Novoa 2012-02-23 13:01:32 +00:00
parent 288767b1ba
commit ef2366fabb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-23 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Set the intensive interval before reading modules.
2012-02-10 Hirofumi Kosaka <kosaka@rworks.jp> 2012-02-10 Hirofumi Kosaka <kosaka@rworks.jp>
* pandora_agent: Allow filename wildcards to specify * pandora_agent: Allow filename wildcards to specify

10
pandora_agents/unix/pandora_agent
View File

@ -585,6 +585,11 @@ sub read_config (;$) {
# Single value token not found. # Single value token not found.
return undef; return undef;
} }
# Set the intensive interval
if ($Conf{'intensive_interval'} == 0) {
$Conf{'intensive_interval'} = $Conf{'interval'};
}
# Module, plugin and collection definitions # Module, plugin and collection definitions
parse_conf_modules(\@file); 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'} = '-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'); $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'};
}
} }
################################################################################# #################################################################################