better names for timeout settings

2018-02-10 22:27:29 +00:00
parent a024716495
commit 4acad9932e
4 changed files with 9 additions and 4 deletions
--- 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))) {