Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 04:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some bugz0rs.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-01-05 12:03:54 +00:00
parent 4dd0e26ddc
commit e8f3b6468c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/socketDrivers.py
View File

@ -114,11 +114,15 @@ class SocketDriver(drivers.IrcDriver):
self._sendIfMsgs() self._sendIfMsgs()
def reconnect(self, wait=False): def reconnect(self, wait=False):
log.info('Reconnect called.') log.info('Reconnect called on driver for %s.' % self.irc)
if self.connected:
self.conn.close()
self.connected = False
if wait: if wait:
log.info('Reconnect waiting.') log.info('Reconnect waiting.')
self._scheduleReconnect() self._scheduleReconnect()
return return
self.irc.reset()
self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.conn.settimeout(conf.poll*10) # Allow more time for connect. self.conn.settimeout(conf.poll*10) # Allow more time for connect.
if self.reconnectWaitsIndex < len(self.reconnectWaits)-1: if self.reconnectWaitsIndex < len(self.reconnectWaits)-1:
@ -139,10 +143,6 @@ class SocketDriver(drivers.IrcDriver):
self.irc.die() self.irc.die()
def _scheduleReconnect(self): def _scheduleReconnect(self):
self.irc.reset()
if self.connected:
self.conn.close()
self.connected = False
when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex] when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex]
whenS = time.strftime(conf.logTimestampFormat, time.localtime(when)) whenS = time.strftime(conf.logTimestampFormat, time.localtime(when))
if not world.dying: if not world.dying: