3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-24 11:42:51 +01:00

Merge branch 'devel' into wip/hybrid

This commit is contained in:
James Lu 2016-04-07 18:46:05 -07:00
commit f35008ac64
2 changed files with 3 additions and 3 deletions

View File

@ -94,7 +94,7 @@ class Irc():
"""
self.sid = self.serverdata["sid"]
self.botdata = self.conf['bot']
self.pingfreq = self.serverdata.get('pingfreq') or 30
self.pingfreq = self.serverdata.get('pingfreq') or 180
self.pingtimeout = self.pingfreq * 2
self.connected.clear()

View File

@ -111,9 +111,9 @@ servers:
# Sets ping frequency (i.e. how long we should wait between sending
# pings to our uplink). When more than two consecutive pings are missed,
# PyLink will disconnect with a ping timeout. This defaults to 30 if
# PyLink will disconnect with a ping timeout. This defaults to 180 if
# not set.
pingfreq: 30
pingfreq: 180
# Separator character (used by relay)
separator: "/"