+ enhance jolokia handle error

This commit is contained in:
garnier-quentin 2017-03-15 15:44:15 +01:00
parent 569dafc5d8
commit 41c18ef51f
1 changed files with 19 additions and 9 deletions

View File

@ -165,6 +165,16 @@ sub _add_request {
return $request; return $request;
} }
sub check_error {
my ($self, %options) = @_;
# 500-599 an error. 400 is an attribute not present
if ($options{response}->status() >= 500 || $options{response}->status() == 401 || $options{response}->status() == 408) {
$self->{output}->add_option_msg(short_msg => "protocol issue: " . $options{response}->error_text());
$self->{output}->option_exit();
}
}
sub get_attributes { sub get_attributes {
my ($self, %options) = @_; my ($self, %options) = @_;
my $nothing_quit = defined($options{nothing_quit}) && $options{nothing_quit} == 1 ? 1 : 0; my $nothing_quit = defined($options{nothing_quit}) && $options{nothing_quit} == 1 ? 1 : 0;
@ -199,11 +209,7 @@ sub get_attributes {
for (my $j = 0; defined($options{request}->[$i]->{attributes}) && for (my $j = 0; defined($options{request}->[$i]->{attributes}) &&
defined($responses[$pos]) && $j < scalar(@{$options{request}->[$i]->{attributes}}); $j++, $pos++) { defined($responses[$pos]) && $j < scalar(@{$options{request}->[$i]->{attributes}}); $j++, $pos++) {
if ($responses[$pos]->is_error()) { if ($responses[$pos]->is_error()) {
# 500-599 an error. 400 is an attribute not present $self->check_error(response => $responses[$pos]);
if ($responses[$pos]->status() >= 500 || $responses[$pos]->status() == 401 || $responses[$pos]->status() == 408) {
$self->{output}->add_option_msg(short_msg => "protocol issue: " . $responses[$pos]->error_text());
$self->{output}->option_exit();
}
next; next;
} }
@ -222,10 +228,14 @@ sub get_attributes {
} }
if (!defined($options{request}->[$i]->{attributes}) || scalar(@{$options{request}->[$i]->{attributes}}) == 0) { if (!defined($options{request}->[$i]->{attributes}) || scalar(@{$options{request}->[$i]->{attributes}}) == 0) {
my $mbean = $responses[$pos]->{request}->{mbean}; if ($responses[$pos]->is_error()) {
$response->{$mbean} = {} if (!defined($response->{$mbean})); $self->check_error(response => $responses[$pos]);
foreach (keys %{$responses[$pos]->{value}}) { } else {
$response->{$mbean}->{$_} = $responses[$pos]->{value}->{$_}; my $mbean = $responses[$pos]->{request}->{mbean};
$response->{$mbean} = {} if (!defined($response->{$mbean}));
foreach (keys %{$responses[$pos]->{value}}) {
$response->{$mbean}->{$_} = $responses[$pos]->{value}->{$_};
}
} }
$pos++; $pos++;
} }