mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-27 13:19:24 +01:00
Same fix for asyncoreDrivers and a small cleanup.
This commit is contained in:
parent
ff3c996deb
commit
03294c8686
@ -72,10 +72,11 @@ class AsyncoreDriver(asynchat.async_chat, object):
|
|||||||
log.warning('Error connecting to %s: %s', self.server[0], e)
|
log.warning('Error connecting to %s: %s', self.server[0], e)
|
||||||
self.reconnect(wait=True)
|
self.reconnect(wait=True)
|
||||||
|
|
||||||
def scheduleReconnect(self):
|
def _scheduleReconnect(self):
|
||||||
when = log.timestamp(time.time()+60)
|
when = time.time() + 60
|
||||||
if not world.dying:
|
if not world.dying:
|
||||||
log.info('Scheduling reconnect to %s at %s', self.server[0], when)
|
whenS = log.timestamp(when)
|
||||||
|
log.info('Scheduling reconnect to %s at %s', self.server[0], whenS)
|
||||||
def makeNewDriver():
|
def makeNewDriver():
|
||||||
self.irc.reset()
|
self.irc.reset()
|
||||||
driver = self.__class__(self.server, self.irc)
|
driver = self.__class__(self.server, self.irc)
|
||||||
@ -104,7 +105,7 @@ class AsyncoreDriver(asynchat.async_chat, object):
|
|||||||
self.irc.feedMsg(msg)
|
self.irc.feedMsg(msg)
|
||||||
|
|
||||||
def handle_close(self):
|
def handle_close(self):
|
||||||
self.scheduleReconnect()
|
self._scheduleReconnect()
|
||||||
self.die()
|
self.die()
|
||||||
reconnect = handle_close
|
reconnect = handle_close
|
||||||
|
|
||||||
|
@ -175,8 +175,8 @@ class SocketDriver(drivers.IrcDriver):
|
|||||||
|
|
||||||
def _scheduleReconnect(self):
|
def _scheduleReconnect(self):
|
||||||
when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex]
|
when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex]
|
||||||
whenS = log.timestamp(when)
|
|
||||||
if not world.dying:
|
if not world.dying:
|
||||||
|
whenS = log.timestamp(when)
|
||||||
log.info('Scheduling reconnect to %s at %s', self.server, whenS)
|
log.info('Scheduling reconnect to %s at %s', self.server, whenS)
|
||||||
schedule.addEvent(self.reconnect, when)
|
schedule.addEvent(self.reconnect, when)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user