GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-09 02:54:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into devel

Browse Source
This commit is contained in:
James Lu 2016-06-30 19:00:39 -07:00
commit 4cd49296e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/relay.py
View File

@ -207,7 +207,7 @@ def getPrefixModes(irc, remoteirc, channel, user, mlist=None):
return modes return modes
def spawnRelayServer(irc, remoteirc): def spawnRelayServer(irc, remoteirc):
irc.connected.wait() irc.connected.wait(5)
try: try:
# ENDBURST is delayed by 3 secs on supported IRCds to prevent # ENDBURST is delayed by 3 secs on supported IRCds to prevent
# triggering join-flood protection and the like. # triggering join-flood protection and the like.
@ -329,7 +329,7 @@ def getRemoteUser(irc, remoteirc, user, spawnIfMissing=True):
# Wait until the network is working before trying to spawn anything. # Wait until the network is working before trying to spawn anything.
log.debug('(%s) getRemoteUser: waiting for irc.connected', irc.name) 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. # Don't spawn clones for registered service bots.
sbot = irc.isServiceBot(user) sbot = irc.isServiceBot(user)