From 4acad9932e0937d5eb897f2f3413c984495d768a Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 10 Feb 2018 22:27:29 +0000
Subject: [PATCH] better names for timeout settings

---
 lib/App/Netdisco/Configuration.pm | 5 +++++
 lib/App/Netdisco/Util/Nbtstat.pm  | 2 +-
 lib/App/Netdisco/Worker/Runner.pm | 2 +-
 share/config.yml                  | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm
index 758d5c32..32b324e0 100644
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -176,6 +176,11 @@ if (exists 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
 setting('schedule')->{expire} ||= setting('schedule')->{expiry}
   if setting('schedule') and exists setting('schedule')->{expiry};
diff --git a/lib/App/Netdisco/Util/Nbtstat.pm b/lib/App/Netdisco/Util/Nbtstat.pm
index c12efc56..4b0cccab 100644
--- a/lib/App/Netdisco/Util/Nbtstat.pm
+++ b/lib/App/Netdisco/Util/Nbtstat.pm
@@ -42,7 +42,7 @@ service status for addresses which responded.
 sub nbtstat_resolve_async {
     my $ips = shift;
 
-    my $timeout  = setting('nbtstat_timeout')  || 1;
+    my $timeout  = setting('nbtstat_response_timeout')  || 1;
     my $interval = setting('nbtstat_interval') || 0.02;
 
     my $stater = App::Netdisco::AnyEvent::Nbtstat->new(
diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm
index f4fad1e4..193281ca 100644
--- a/lib/App/Netdisco/Worker/Runner.pm
+++ b/lib/App/Netdisco/Worker/Runner.pm
@@ -74,7 +74,7 @@ sub run {
   };
 
   my $maxtime = ((defined setting($job->action .'_timeout'))
-    ? setting($job->action .'_timeout') : setting('timeout'));
+    ? setting($job->action .'_timeout') : setting('workers')->{'timeout'});
   if ($maxtime) {
     debug sprintf '%s: running with timeout %ss', $job->action, $maxtime;
     if (timeout_call($maxtime, $runner, ($self, $job))) {
diff --git a/share/config.yml b/share/config.yml
index b78a16c8..8d6c2123 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -200,7 +200,6 @@ snmpretries: 2
 snmp_remoteport: {}
 devices_no: []
 devices_only: []
-timeout: 600
 discover_no: []
 discover_only: []
 discover_no_type:
@@ -231,7 +230,7 @@ nbtstat_no: []
 nbtstat_only: []
 nbtstat_max_age: 7
 nbtstat_interval: 0.02
-nbtstat_timeout: 1
+nbtstat_response_timeout: 1
 node_freshness: 0
 expire_devices: 60
 expire_nodes: 90
@@ -281,6 +280,7 @@ wap_platforms:
 
 workers:
   tasks: 'AUTO * 2'
+  timeout: 600
   sleep_time: 1
   min_runtime: 0
   max_deferrals: 10