GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +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-25 11:36:55 -07:00
commit f009a739bc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes.py
View File

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

4
plugins/relay.py
View File

@ -334,11 +334,9 @@ def getRemoteUser(irc, remoteirc, user, spawnIfMissing=True):
Gets the UID of the relay client requested on the target network (remoteirc),
spawning one if it doesn't exist and spawnIfMissing is True."""
# Wait until both the local and remote networks are 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)
irc.connected.wait()
log.debug('(%s) getRemoteUser: waiting for %s.connected', irc.name, remoteirc.name)
remoteirc.connected.wait()
# Don't spawn clones for registered service bots.
sbot = irc.isServiceBot(user)