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

2014-01-09 Junichi Satoh <junichi@rworks.jp> 

* lib/PandoraFMS/PluginServer.pm: Fixed that 'plugin_timeout' in
	pandora_server.conf is not used when max_timeout is 0.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-01-09 09:25:45 +00:00
parent 89e0ff6ea3
commit 4d8ede7f67
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2014-01-09 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/PluginServer.pm: Fixed that 'plugin_timeout' in
pandora_server.conf is not used when max_timeout is 0.
2014-01-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a typo that prevented timestamps in

2
pandora_server/lib/PandoraFMS/PluginServer.pm
View File

@ -152,7 +152,7 @@ sub data_consumer ($$) {
return unless defined $agent;
# Use the smallest timeout
my $timeout = ($plugin->{'max_timeout'} < $pa_config->{'plugin_timeout'}) ?
my $timeout = (($plugin->{'max_timeout'} < $pa_config->{'plugin_timeout'}) && $pa_config->{'max_timeout'}) ?
$plugin->{'max_timeout'} : $pa_config->{'plugin_timeout'};
# Setting default timeout if is invalid