clientbot: make SASL timeout configurable & raise default to 15 secs

(cherry picked from commit 9d50a4363b)

example-conf.yml

@@ -305,6 +305,9 @@ servers:
         #sasl_username: "mIRCsKripterz"
         #sasl_password: "DownLoaditn00b!!!"
 
+        # Defines the SASL timeout - this defaults to 15 seconds.
+        #sasl_timeout: 15
+
         # If this option is enabled, the bot will attempt SASL authentication even after it's
         # connected, as services become available throughout netsplits and reconnects.
         # Note: This requires an IRC server capable of IRCv3.2 cap-notify and sasl:

protocols/clientbot.py

@@ -81,7 +81,7 @@ class ClientbotWrapperProtocol(Protocol):
             log.info('(%s) Skipping SASL due to timeout; are the IRCd and services configured '
                      'properly?', self.irc.name)
             self.capEnd()
-        self._cap_timer = threading.Timer(5, capEnd)
+        self._cap_timer = threading.Timer(self.irc.serverdata.get('sasl_timeout') or 15, capEnd)
         self._cap_timer.start()
 
         # This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS.