3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 04:02:45 +01:00

Merge remote-tracking branch 'origin/bump-timeouts' into devel

This commit is contained in:
James Lu 2016-06-11 10:19:57 -07:00
commit 26a5809582

View File

@ -47,8 +47,8 @@ class Irc():
self.bot_clients = {}
self.protoname = proto.__name__
self.proto = proto.Class(self)
self.pingfreq = self.serverdata.get('pingfreq') or 90
self.pingtimeout = self.pingfreq * 2
self.pingfreq = self.serverdata.get('pingfreq') or 180
self.pingtimeout = self.pingfreq * 3
self.connected = threading.Event()
self.aborted = threading.Event()
@ -98,7 +98,7 @@ class Irc():
self.sid = self.serverdata["sid"]
self.botdata = self.conf['bot']
self.pingfreq = self.serverdata.get('pingfreq') or 180
self.pingtimeout = self.pingfreq * 2
self.pingtimeout = self.pingfreq * 3
self.connected.clear()
self.aborted.clear()