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

Added module_timeout to module_plugin in Unix agent

This commit is contained in:
fermin831 2015-09-29 16:28:55 +02:00
parent 52f75733be
commit e9285eac98
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_agents/unix/pandora_agent Normal file → Executable file
View File

@ -1914,7 +1914,15 @@ sub module_plugin ($) {
return () if ($command eq ''); return () if ($command eq '');
# Execute the plugin # Execute the plugin
my $output = `$command 2>$DevNull`;
my $output = "";
if ($plugin->{'timeout'} == 0) {
$output = `$command 2>$DevNull`;
log_message ('debug', "Executing plugin: " . $command) if ($Conf{'debug'} eq '1');
} else {
$output = `$Conf{'pandora_exec'} $plugin->{'timeout'} $command 2> $DevNull`;
log_message ('debug', "Executing plugin: (" . $command . ") with timeout: " . $plugin->{'timeout'} . "s") if ($Conf{'debug'} eq '1');
}
# Do not save the output if there was an error # Do not save the output if there was an error
if ($? != 0) { if ($? != 0) {