From 0dff025c48d30be688cae950269308c06c1893f2 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Wed, 11 Sep 2013 16:08:26 +0000 Subject: [PATCH] Better error management git-svn-id: http://svn.merethis.net/centreon-esxd/trunk@77 a5eaa968-4c79-4d68-970d-af6011b5b055 --- connectors/vmware/lib/cmddatastoreusage.pm | 1 - connectors/vmware/lib/common.pm | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/connectors/vmware/lib/cmddatastoreusage.pm b/connectors/vmware/lib/cmddatastoreusage.pm index a0f4062d2..5b2434ba8 100644 --- a/connectors/vmware/lib/cmddatastoreusage.pm +++ b/connectors/vmware/lib/cmddatastoreusage.pm @@ -107,7 +107,6 @@ sub run { my $capacity = $ds->summary->capacity; my $free = $ds->summary->freeSpace; - if ($self->{units} eq 'MB' && $self->{free} == 1) { $warn_threshold = $capacity - ($self->{warn} * 1024 * 1024); $crit_threshold = $capacity - ($self->{crit} * 1024 * 1024); diff --git a/connectors/vmware/lib/common.pm b/connectors/vmware/lib/common.pm index c7e01db9d..cbb047c9a 100644 --- a/connectors/vmware/lib/common.pm +++ b/connectors/vmware/lib/common.pm @@ -200,14 +200,14 @@ sub generic_performance_values_historic { #maxSample => 1); } my $perfdata = $obj_esxd->{perfmanager_view}->QueryPerf(querySpec => $perf_query_spec); - if (!$$perfdata[0]) { - $obj_esxd->print_response("-3|Error: Cannot get value for couters. Maybe there is time sync problem (check the esxd server and the target also).\n"); + if (!$$perfdata[0] || !defined($$perfdata[0]->value)) { + $obj_esxd->print_response("-3|Error: Cannot get value for counters. Maybe you have call a wrong instance.\n"); return undef; } foreach (@{$$perfdata[0]->value}) { $results{$_->id->counterId . ":" . (defined($_->id->instance) ? $_->id->instance : "")} = $_->value; if (!defined($_->value)) { - $obj_esxd->print_response("-3|Error: Cannot get value for couters. Maybe there is time sync problem (check the esxd server and the target also).\n"); + $obj_esxd->print_response("-3|Error: Cannot get value for counters. Maybe there is time sync problem (check the esxd server and the target also).\n"); return undef; } } @@ -289,7 +289,7 @@ sub get_entities_host { sub performance_errors { my ($obj_esxd, $values) = @_; - # Error counter not available or orther from function + # Error counter not available or other from function return 1 if (!defined($values) || scalar(keys(%$values)) <= 0); return 0; }