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

Merge branch 'fix-plugin-timeout' into 'develop' 

Fixed plugin timeout.

See merge request artica/pandorafms!1720
This commit is contained in:
vgilc 2018-08-30 08:05:36 +02:00
parent 9d35a66ad3 34c553f5b4
commit 99f42aed87
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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