From 34c553f5b4c7be717641d8fda20e1af05f6fb4dd Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Thu, 30 Aug 2018 13:30:22 +0900 Subject: [PATCH] Fixed plugin timeout. --- pandora_server/lib/PandoraFMS/PluginServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index b94de25598..d57ed6407d 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -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