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

Merge branch 'master' of https://github.com/centreon/centreon-plugins

This commit is contained in:
garnier-quentin 2015-06-23 10:01:55 +02:00
parent cee6a98f15 705aeb922f
commit c22ca869d2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/selenium/mode/scenario.pm
View File

@ -162,15 +162,22 @@ sub run {
} elsif ($trim_action eq 'echo'){
next;
} else {
my $exit_command = $sel->do_command($trim_action, $trim_filter, $trim_value);
my $exit_command;
eval {
$exit_command = $sel->do_command($trim_action, $trim_filter, $trim_value);
};
$self->{output}->output_add(long_msg => "Step " . $temp_step
. " - Command : '" . $trim_action . "'"
. " , Filter : '" . $trim_filter . "'"
. " , Value : '" . $trim_value . "'");
if ($exit_command eq 'OK') {
if (!$@ && $exit_command eq 'OK') {
$exit1 = 'OK';
$stepOk++;
} else {
if ($@) {
$self->{output}->output_add(long_msg => "display: $@");
}
$exit1 = 'CRITICAL';
last;
}
@ -180,7 +187,7 @@ sub run {
my $availability = sprintf("%d", $stepOk * 100 / $step);
my $exit2 = $self->{perfdata}->threshold_check(value => $timeelapsed,
threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2 ]);
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("%d/%d steps (%.3fs)", $stepOk, $step, $timeelapsed));