Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-29 22:22:33 +01:00
Code Issues Projects Releases Wiki Activity

Move our waitReconnectIndex increment to a place where it will actually get

Browse Source 
called.  If it also needs to be where I removed, someone re-add it.
This commit is contained in:
James Vega 2005-01-06 02:58:14 +00:00
parent 3337d813cd
commit 63dc27905b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/socketDrivers.py
View File

@ -119,7 +119,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
def connect(self, **kwargs):
self.reconnect(reset=False, **kwargs)
def reconnect(self, wait=False, reset=True):
self.scheduled = False
if self.connected:
@ -142,13 +142,13 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
self.conn.bind((vhost, 0))
except socket.error, e:
drivers.log.connectError(self.currentServer, e)
if self.reconnectWaitsIndex < len(self.reconnectWaits)-1:
self.reconnectWaitsIndex += 1
self.reconnect(wait=True)
return
# We allow more time for the connect here, since it might take longer.
# At least 10 seconds.
self.conn.settimeout(max(10, conf.supybot.drivers.poll()*10))
if self.reconnectWaitsIndex < len(self.reconnectWaits)-1:
self.reconnectWaitsIndex += 1
try:
self.conn.connect(server)
self.conn.settimeout(conf.supybot.drivers.poll())
@ -189,7 +189,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
if self.scheduled:
schedule.removeEvent(self.scheduled)
drivers.log.die(self.irc)
def _reallyDie(self):
if self.conn is not None:
self.conn.close()