From aa7fb17b4e02da79d16f8be43d62e4027ba7b1b9 Mon Sep 17 00:00:00 2001
From: Safihre <safihre@sabnzbd.org>
Date: Wed, 25 Oct 2017 22:06:12 +0200
Subject: [PATCH] Reduce standard timeout of new servers to 60 seconds

In line with other usenet software.
---
 interfaces/Config/templates/config_server.tmpl | 4 ++--
 sabnzbd/config.py                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interfaces/Config/templates/config_server.tmpl b/interfaces/Config/templates/config_server.tmpl
index 7b1ecd3..e1e613d 100644
--- a/interfaces/Config/templates/config_server.tmpl
+++ b/interfaces/Config/templates/config_server.tmpl
@@ -57,7 +57,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="timeout">$T('srv-timeout')</label>
-                    <input type="number" name="timeout" id="timeout" min="30" /> <i>$T('seconds')</i>
+                    <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
                 </div>
                 <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
                     <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
@@ -219,7 +219,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="timeout$cur">$T('srv-timeout')</label>
-                    <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="30" required /> <i>$T('seconds')</i>
+                    <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
                 </div>
 
                 <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
diff --git a/sabnzbd/config.py b/sabnzbd/config.py
index 3dab5d8..ecad51e 100644
--- a/sabnzbd/config.py
+++ b/sabnzbd/config.py
@@ -385,7 +385,7 @@ class ConfigServer(object):
         self.displayname = OptionStr(name, 'displayname', '', add=False)
         self.host = OptionStr(name, 'host', '', add=False)
         self.port = OptionNumber(name, 'port', 119, 0, 2 ** 16 - 1, add=False)
-        self.timeout = OptionNumber(name, 'timeout', 120, 30, 240, add=False)
+        self.timeout = OptionNumber(name, 'timeout', 60, 20, 240, add=False)
         self.username = OptionStr(name, 'username', '', add=False)
         self.password = OptionPassword(name, 'password', '', add=False)
         self.connections = OptionNumber(name, 'connections', 1, 0, 100, add=False)