135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turn connect fail into defer

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-23 08:40:27 +01:00
parent eac1857043
commit 88ae9c00ba
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/Backend/Worker/Interactive/DeviceActions.pm
View File

@@ -23,7 +23,7 @@ sub _set_device_generic {
# snmp connect using rw community # snmp connect using rw community
my $info = snmp_connect_rw($ip) my $info = snmp_connect_rw($ip)
or return job_error("Failed to connect to device [$ip] to update $slot"); or return job_defer("Failed to connect to device [$ip] to update $slot");
my $method = 'set_'. $slot; my $method = 'set_'. $slot;
my $rv = $info->$method($data); my $rv = $info->$method($data);

4
lib/App/Netdisco/Backend/Worker/Interactive/PortActions.pm
View File

@@ -75,7 +75,7 @@ sub _set_port_generic {
if ($device->vendor ne 'netdisco') { if ($device->vendor ne 'netdisco') {
# snmp connect using rw community # snmp connect using rw community
my $info = snmp_connect_rw($ip) my $info = snmp_connect_rw($ip)
or return job_error("Failed to connect to device [$ip] to control port"); or return job_defer("Failed to connect to device [$ip] to control port");
my $iid = get_iid($info, $port) my $iid = get_iid($info, $port)
or return job_error("Failed to get port ID for [$pn] from [$ip]"); or return job_error("Failed to get port ID for [$pn] from [$ip]");
@@ -128,7 +128,7 @@ sub power {
# snmp connect using rw community # snmp connect using rw community
my $info = snmp_connect_rw($ip) my $info = snmp_connect_rw($ip)
or return job_error("Failed to connect to device [$ip] to control port"); or return job_defer("Failed to connect to device [$ip] to control power");
my $powerid = get_powerid($info, $port) my $powerid = get_powerid($info, $port)
or return job_error("Failed to get power ID for [$pn] from [$ip]"); or return job_error("Failed to get power ID for [$pn] from [$ip]");

2
lib/App/Netdisco/Backend/Worker/Poller/Common.pm
View File

@@ -64,7 +64,7 @@ sub _single_body {
my $snmp = snmp_connect($device); my $snmp = snmp_connect($device);
if (!defined $snmp) { if (!defined $snmp) {
return job_error("$job_type failed: could not SNMP connect to $host"); return job_defer("$job_type failed: could not SNMP connect to $host");
} }
unless ($snmp->has_layer( $job_layer )) { unless ($snmp->has_layer( $job_layer )) {

2
lib/App/Netdisco/Backend/Worker/Poller/Device.pm
View File

@@ -60,7 +60,7 @@ sub discover {
my $snmp = snmp_connect($device); my $snmp = snmp_connect($device);
if (!defined $snmp) { if (!defined $snmp) {
return job_error("discover failed: could not SNMP connect to $host"); return job_defer("discover failed: could not SNMP connect to $host");
} }
store_device($device, $snmp); store_device($device, $snmp);