GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 11:39:25 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 9d50a4363b)
This commit is contained in:
James Lu 2017-04-05 23:08:17 -07:00
parent 84448e9803
commit 22ceb3f699
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example-conf.yml
View File

@ -305,6 +305,9 @@ servers:
#sasl_username: "mIRCsKripterz" #sasl_username: "mIRCsKripterz"
#sasl_password: "DownLoaditn00b!!!" #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 # If this option is enabled, the bot will attempt SASL authentication even after it's
# connected, as services become available throughout netsplits and reconnects. # connected, as services become available throughout netsplits and reconnects.
# Note: This requires an IRC server capable of IRCv3.2 cap-notify and sasl: # Note: This requires an IRC server capable of IRCv3.2 cap-notify and sasl:

2
protocols/clientbot.py
View File

@ -81,7 +81,7 @@ class ClientbotWrapperProtocol(Protocol):
log.info('(%s) Skipping SASL due to timeout; are the IRCd and services configured ' log.info('(%s) Skipping SASL due to timeout; are the IRCd and services configured '
'properly?', self.irc.name) 'properly?', self.irc.name)
self.capEnd() 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() self._cap_timer.start()
# This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS. # This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS.