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 #2086

This commit is contained in:
garnier-quentin 2020-07-08 11:50:08 +02:00
parent 872fd65952
commit adc9fbbcf3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
centreon/plugins/dbi.pm
View File

@ -72,11 +72,15 @@ sub new {
# Sometimes, we need to set ENV # Sometimes, we need to set ENV
$self->{env} = undef; $self->{env} = undef;
$self->set_signal_handlers();
return $self; return $self;
} }
sub prepare_destroy {
my ($self) = @_;
%handlers = ();
}
sub set_signal_handlers { sub set_signal_handlers {
my $self = shift; my $self = shift;
@ -93,6 +97,7 @@ sub class_handle_ALRM {
sub handle_ALRM { sub handle_ALRM {
my $self = shift; my $self = shift;
$self->prepare_destroy();
$self->disconnect(); $self->disconnect();
$self->{output}->output_add(severity => $self->{sql_errors_exit}, $self->{output}->output_add(severity => $self->{sql_errors_exit},
short_msg => 'Timeout'); short_msg => 'Timeout');
@ -213,7 +218,8 @@ sub connect {
$ENV{$_} = $self->{env}->{$_}; $ENV{$_} = $self->{env}->{$_};
} }
} }
$self->set_signal_handlers();
alarm($self->{timeout}) if (defined($self->{timeout})); alarm($self->{timeout}) if (defined($self->{timeout}));
$self->{instance} = DBI->connect( $self->{instance} = DBI->connect(
"DBI:". $self->{data_source}, "DBI:". $self->{data_source},
@ -222,6 +228,7 @@ sub connect {
{ RaiseError => 0, PrintError => 0, AutoCommit => 1, %{$self->{connect_options_hash}} } { RaiseError => 0, PrintError => 0, AutoCommit => 1, %{$self->{connect_options_hash}} }
); );
alarm(0) if (defined($self->{timeout})); alarm(0) if (defined($self->{timeout}));
$self->prepare_destroy();
if (!defined($self->{instance})) { if (!defined($self->{instance})) {
my $err_msg = sprintf('Cannot connect: %s', defined($DBI::errstr) ? $DBI::errstr : '(no error string)'); my $err_msg = sprintf('Cannot connect: %s', defined($DBI::errstr) ? $DBI::errstr : '(no error string)');