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

better names for timeout settings

Browse Source
This commit is contained in:
Oliver Gorwits
2018-02-10 22:27:29 +00:00
parent a024716495
commit 4acad9932e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Configuration.pm
View File

@@ -176,6 +176,11 @@ if (exists setting('workers')->{interactives}
delete setting('workers')->{interactives}; delete setting('workers')->{interactives};
} }
# moved the timeout setting
setting('workers')->{'timeout'} = setting('timeout')
if defined setting('timeout')
and !defined setting('workers')->{'timeout'};
# schedule expire used to be called expiry # schedule expire used to be called expiry
setting('schedule')->{expire} ||= setting('schedule')->{expiry} setting('schedule')->{expire} ||= setting('schedule')->{expiry}
if setting('schedule') and exists setting('schedule')->{expiry}; if setting('schedule') and exists setting('schedule')->{expiry};

2
lib/App/Netdisco/Util/Nbtstat.pm
View File

@@ -42,7 +42,7 @@ service status for addresses which responded.
sub nbtstat_resolve_async { sub nbtstat_resolve_async {
my $ips = shift; my $ips = shift;
my $timeout = setting('nbtstat_timeout') || 1; my $timeout = setting('nbtstat_response_timeout') || 1;
my $interval = setting('nbtstat_interval') || 0.02; my $interval = setting('nbtstat_interval') || 0.02;
my $stater = App::Netdisco::AnyEvent::Nbtstat->new( my $stater = App::Netdisco::AnyEvent::Nbtstat->new(

2
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -74,7 +74,7 @@ sub run {
}; };
my $maxtime = ((defined setting($job->action .'_timeout')) my $maxtime = ((defined setting($job->action .'_timeout'))
? setting($job->action .'_timeout') : setting('timeout')); ? setting($job->action .'_timeout') : setting('workers')->{'timeout'});
if ($maxtime) { if ($maxtime) {
debug sprintf '%s: running with timeout %ss', $job->action, $maxtime; debug sprintf '%s: running with timeout %ss', $job->action, $maxtime;
if (timeout_call($maxtime, $runner, ($self, $job))) { if (timeout_call($maxtime, $runner, ($self, $job))) {

4
share/config.yml
View File

@@ -200,7 +200,6 @@ snmpretries: 2
snmp_remoteport: {} snmp_remoteport: {}
devices_no: [] devices_no: []
devices_only: [] devices_only: []
timeout: 600
discover_no: [] discover_no: []
discover_only: [] discover_only: []
discover_no_type: discover_no_type:
@@ -231,7 +230,7 @@ nbtstat_no: []
nbtstat_only: [] nbtstat_only: []
nbtstat_max_age: 7 nbtstat_max_age: 7
nbtstat_interval: 0.02 nbtstat_interval: 0.02
nbtstat_timeout: 1 nbtstat_response_timeout: 1
node_freshness: 0 node_freshness: 0
expire_devices: 60 expire_devices: 60
expire_nodes: 90 expire_nodes: 90
@@ -281,6 +280,7 @@ wap_platforms:
workers: workers:
tasks: 'AUTO * 2' tasks: 'AUTO * 2'
timeout: 600
sleep_time: 1 sleep_time: 1
min_runtime: 0 min_runtime: 0
max_deferrals: 10 max_deferrals: 10