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

snmpretries setting not working if unset (S. Xu)

Browse Source
This commit is contained in:
Oliver Gorwits
2015-11-16 21:39:23 +00:00
parent 5c8c3c7fda
commit d1c0b31f5a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.033004 - 2015-11-16
[BUG FIXES]
* snmpretries setting not working if unset (S. Xu)
2.033003 - 2015-10-04 2.033003 - 2015-10-04
[ENHANCEMENTS] [ENHANCEMENTS]

4
Netdisco/lib/App/Netdisco/Util/SNMP.pm
View File

@@ -66,7 +66,9 @@ sub _snmp_connect_generic {
my %snmp_args = ( my %snmp_args = (
AutoSpecify => 0, AutoSpecify => 0,
DestHost => $device->ip, DestHost => $device->ip,
Retries => (setting('snmpretries') || 2), # 0 is falsy. Using || with snmpretries equal to 0 will set retries to 2.
# check if the setting is 0. If not, use the default value of 2.
Retries => (setting('snmpretries') || setting('snmpretries') == 0 ? 0 : 2),
Timeout => (setting('snmptimeout') || 1000000), Timeout => (setting('snmptimeout') || 1000000),
NonIncreasing => (setting('nonincreasing') || 0), NonIncreasing => (setting('nonincreasing') || 0),
BulkWalk => ((defined setting('bulkwalk_off') && setting('bulkwalk_off')) BulkWalk => ((defined setting('bulkwalk_off') && setting('bulkwalk_off'))