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

Fix timeout issue on windows script. Use "Win32::Job".

This commit is contained in:
garnier-quentin 2015-05-13 09:53:11 +02:00
parent 65e993c01e
commit 60131886b2
7 changed files with 87 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
centreon-plugins/apps/activedirectory/local/mode/dcdiag.pm
View File

@ -157,9 +157,9 @@ sub dcdiag {
$dcdiag_cmd .= ' /test:dfsrevent /test:kccevent' if (($self->{os_is2008} == 1 || $self->{os_is2012} == 1) && defined($self->{option_results}->{dfsr})); $dcdiag_cmd .= ' /test:dfsrevent /test:kccevent' if (($self->{os_is2008} == 1 || $self->{os_is2012} == 1) && defined($self->{option_results}->{dfsr}));
} }
my $stdout = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $dcdiag_cmd . " 2>&1", command => $dcdiag_cmd,
command_path => undef, command_path => undef,
command_options => undef); command_options => undef);

2
centreon-plugins/apps/activedirectory/local/mode/netdom.pm
View File

@ -71,7 +71,7 @@ sub netdom {
my ($stdout, $exit_code) = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout, $exit_code) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $netdom_cmd . " 2>&1", command => $netdom_cmd,
command_path => undef, command_path => undef,
command_options => undef, command_options => undef,
no_quit => 1); no_quit => 1);

4
centreon-plugins/apps/exchange/2010/local/mode/activesyncmailbox.pm
View File

@ -107,8 +107,8 @@ sub run {
no_ps => $self->{option_results}->{no_ps}, no_ps => $self->{option_results}->{no_ps},
no_trust_ssl => $self->{option_results}->{no_trust_ssl} no_trust_ssl => $self->{option_results}->{no_trust_ssl}
); );
$self->{option_results}->{command_options} .= " " . $ps . " 2>&1"; $self->{option_results}->{command_options} .= " " . $ps;
my $stdout = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},

4
centreon-plugins/apps/exchange/2010/local/mode/databases.pm
View File

@ -104,8 +104,8 @@ sub run {
no_mapi => $self->{option_results}->{no_mapi}, no_mapi => $self->{option_results}->{no_mapi},
filter_database => $self->{option_results}->{ps_database_filter}, filter_database => $self->{option_results}->{ps_database_filter},
filter_database_test => $self->{option_results}->{ps_database_test_filter}); filter_database_test => $self->{option_results}->{ps_database_test_filter});
$self->{option_results}->{command_options} .= " " . $ps . " 2>&1"; $self->{option_results}->{command_options} .= " " . $ps;
my $stdout = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},

4
centreon-plugins/apps/exchange/2010/local/mode/imapmailbox.pm
View File

@ -106,8 +106,8 @@ sub run {
password => $self->{option_results}->{password}, password => $self->{option_results}->{password},
no_ps => $self->{option_results}->{no_ps}, no_ps => $self->{option_results}->{no_ps},
); );
$self->{option_results}->{command_options} .= " " . $ps . " 2>&1"; $self->{option_results}->{command_options} .= " " . $ps;
my $stdout = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},

4
centreon-plugins/apps/exchange/2010/local/mode/mapimailbox.pm
View File

@ -101,8 +101,8 @@ sub run {
mailbox => $self->{option_results}->{mailbox}, mailbox => $self->{option_results}->{mailbox},
no_ps => $self->{option_results}->{no_ps}, no_ps => $self->{option_results}->{no_ps},
); );
$self->{option_results}->{command_options} .= " " . $ps . " 2>&1"; $self->{option_results}->{command_options} .= " " . $ps;
my $stdout = centreon::plugins::misc::windows_execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::windows_execute(output => $self->{output},
timeout => $self->{option_results}->{timeout}, timeout => $self->{option_results}->{timeout},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},

72
centreon-plugins/centreon/plugins/misc.pm
View File

@ -39,39 +39,81 @@ use strict;
use warnings; use warnings;
use utf8; use utf8;
# Function more simple for Windows platform
sub windows_execute { sub windows_execute {
my (%options) = @_; my (%options) = @_;
my $result = undef; my $result;
my $stdout = ''; my ($stdout, $pid, $ended) = ('');
my ($exit_code, $cmd); my ($exit_code, $cmd);
$cmd = $options{command_path} . '/' if (defined($options{command_path})); $cmd = $options{command_path} . '/' if (defined($options{command_path}));
$cmd .= $options{command} . ' ' if (defined($options{command})); $cmd .= $options{command} . ' ' if (defined($options{command}));
$cmd .= $options{command_options} if (defined($options{command_options})); $cmd .= $options{command_options} if (defined($options{command_options}));
eval { centreon::plugins::misc::mymodule_load(output => $options{output}, module => 'Win32::Job',
local $SIG{ALRM} = sub { die "Timeout by signal ALARM\n"; }; error_msg => "Cannot load module 'Win32::Job'.");
alarm( $options{timeout} ); centreon::plugins::misc::mymodule_load(output => $options{output}, module => 'Time::HiRes',
$stdout = `$cmd`; error_msg => "Cannot load module 'Time::HiRes'.");
$exit_code = ($? >> 8);
alarm(0);
};
if ($@) { $| = 1;
pipe FROM_CHILD, TO_PARENT or do {
$options{output}->output_add(severity => 'UNKNOWN',
short_msg => "Internal error: can't create pipe from child to parent: $!");
$options{output}->display();
$options{output}->exit();
};
my $job = Win32::Job->new;
if (!($pid = $job->spawn(undef, $cmd,
{ stdout => \*TO_PARENT,
stderr => \*TO_PARENT }))) {
$options{output}->output_add(severity => 'UNKNOWN',
short_msg => "Internal error: execution issue: $^E");
$options{output}->display();
$options{output}->exit();
}
close TO_PARENT;
my $ein = "";
vec($ein, fileno(FROM_CHILD), 1) = 1;
$job->watch(
sub {
my ($buffer);
my $time = $options{timeout};
my $last_time = Time::HiRes::time();
$ended = 0;
while (select($ein, undef, undef, $options{timeout})) {
if (sysread(FROM_CHILD, $buffer, 16384)) {
$buffer =~ s/\r//g;
$stdout .= $buffer;
} else {
$ended = 1;
last;
}
$options{timeout} -= Time::HiRes::time() - $last_time;
last if ($options{timeout} <= 0);
$last_time = Time::HiRes::time();
}
return 1 if ($ended == 0);
return 0;
},
0.1
);
$result = $job->status;
close FROM_CHILD;
if ($ended == 0) {
$options{output}->output_add(severity => 'UNKNOWN', $options{output}->output_add(severity => 'UNKNOWN',
short_msg => "Command too long to execute (timeout)..."); short_msg => "Command too long to execute (timeout)...");
$options{output}->display(); $options{output}->display();
$options{output}->exit(); $options{output}->exit();
} }
chomp $stdout; chomp $stdout;
$stdout =~ s/\r//g;
if (defined($options{no_quit}) && $options{no_quit} == 1) { if (defined($options{no_quit}) && $options{no_quit} == 1) {
return ($stdout, $exit_code); return ($stdout, $result->{$pid}->{exitcode});
} }
if ($exit_code != 0) { if ($result->{$pid}->{exitcode} != 0) {
$stdout =~ s/\n/ - /g; $stdout =~ s/\n/ - /g;
$options{output}->output_add(severity => 'UNKNOWN', $options{output}->output_add(severity => 'UNKNOWN',
short_msg => "Command error: $stdout"); short_msg => "Command error: $stdout");
@ -79,7 +121,7 @@ sub windows_execute {
$options{output}->exit(); $options{output}->exit();
} }
return $stdout; return ($stdout, $result->{$pid}->{exitcode});
} }
sub execute { sub execute {