From eef4731d79fc64771b3cdcede5b79edc09d00b1c Mon Sep 17 00:00:00 2001 From: qgarnier Date: Mon, 27 Sep 2021 14:51:07 +0200 Subject: [PATCH] enh(collection): can use constant options (#3148) --- apps/protocols/snmp/mode/collection.pm | 8 ++++---- centreon/common/protocols/sql/mode/collection.pm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/protocols/snmp/mode/collection.pm b/apps/protocols/snmp/mode/collection.pm index c507a520f..012cb6730 100644 --- a/apps/protocols/snmp/mode/collection.pm +++ b/apps/protocols/snmp/mode/collection.pm @@ -774,10 +774,10 @@ sub set_constants { my ($self, %options) = @_; my $constants = {}; - return $constants if (!defined($self->{config}->{constants})); - - foreach (keys %{$self->{config}->{constants}}) { - $constants->{'constants.' . $_} = $self->{config}->{constants}->{$_}; + if (defined($self->{config}->{constants})) { + foreach (keys %{$self->{config}->{constants}}) { + $constants->{'constants.' . $_} = $self->{config}->{constants}->{$_}; + } } foreach (keys %{$self->{option_results}->{constant}}) { $constants->{'constants.' . $_} = $self->{option_results}->{constant}->{$_}; diff --git a/centreon/common/protocols/sql/mode/collection.pm b/centreon/common/protocols/sql/mode/collection.pm index bc26e2977..870adcef3 100644 --- a/centreon/common/protocols/sql/mode/collection.pm +++ b/centreon/common/protocols/sql/mode/collection.pm @@ -710,10 +710,10 @@ sub set_constants { my ($self, %options) = @_; my $constants = {}; - return $constants if (!defined($self->{config}->{constants})); - - foreach (keys %{$self->{config}->{constants}}) { - $constants->{'constants.' . $_} = $self->{config}->{constants}->{$_}; + if (defined($self->{config}->{constants})) { + foreach (keys %{$self->{config}->{constants}}) { + $constants->{'constants.' . $_} = $self->{config}->{constants}->{$_}; + } } foreach (keys %{$self->{option_results}->{constant}}) { $constants->{'constants.' . $_} = $self->{option_results}->{constant}->{$_};