From dda1d6865d6e7cc5031cc6ce46ab806237318366 Mon Sep 17 00:00:00 2001 From: James Lu Date: Mon, 27 Jun 2016 22:46:53 -0700 Subject: [PATCH 1/2] example-conf: correct wrong default pingfreq (cherry picked from commit 0460df0e51c94f015ab14cea3933f17b957691e6) --- example-conf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-conf.yml b/example-conf.yml index 15ccadc..e3df6ed 100644 --- a/example-conf.yml +++ b/example-conf.yml @@ -84,9 +84,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 180 if + # PyLink will disconnect with a ping timeout. This defaults to 90 if # not set. - pingfreq: 180 + pingfreq: 90 # Separator character (used by relay) separator: "/" From 5f2da1c8c3d60e9f97f407b9c8d5513eeb50141a Mon Sep 17 00:00:00 2001 From: James Lu Date: Wed, 29 Jun 2016 18:12:50 -0700 Subject: [PATCH 2/2] relay: cap waiting time for irc.connected to 5 seconds --- plugins/relay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/relay.py b/plugins/relay.py index 13e9802..aa45025 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -212,7 +212,7 @@ def getPrefixModes(irc, remoteirc, channel, user, mlist=None): return modes def spawnRelayServer(irc, remoteirc): - irc.connected.wait() + irc.connected.wait(5) try: # ENDBURST is delayed by 3 secs on supported IRCds to prevent # triggering join-flood protection and the like. @@ -341,7 +341,7 @@ def getRemoteUser(irc, remoteirc, user, spawnIfMissing=True): # Wait until the network is working before trying to spawn anything. log.debug('(%s) getRemoteUser: waiting for irc.connected', irc.name) - irc.connected.wait() + irc.connected.wait(5) # Don't spawn clones for registered service bots. sbot = irc.isServiceBot(user)