From 03294c868600c5065d5cce4ad96c672f9df5e91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 12 Apr 2004 21:44:03 +0000 Subject: [PATCH] Same fix for asyncoreDrivers and a small cleanup. --- src/asyncoreDrivers.py | 9 +++++---- src/socketDrivers.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/asyncoreDrivers.py b/src/asyncoreDrivers.py index d4da5982e..047fb43a0 100644 --- a/src/asyncoreDrivers.py +++ b/src/asyncoreDrivers.py @@ -72,10 +72,11 @@ class AsyncoreDriver(asynchat.async_chat, object): log.warning('Error connecting to %s: %s', self.server[0], e) self.reconnect(wait=True) - def scheduleReconnect(self): - when = log.timestamp(time.time()+60) + def _scheduleReconnect(self): + when = time.time() + 60 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(): self.irc.reset() driver = self.__class__(self.server, self.irc) @@ -104,7 +105,7 @@ class AsyncoreDriver(asynchat.async_chat, object): self.irc.feedMsg(msg) def handle_close(self): - self.scheduleReconnect() + self._scheduleReconnect() self.die() reconnect = handle_close diff --git a/src/socketDrivers.py b/src/socketDrivers.py index 30a37da70..64c707dd4 100644 --- a/src/socketDrivers.py +++ b/src/socketDrivers.py @@ -175,8 +175,8 @@ class SocketDriver(drivers.IrcDriver): def _scheduleReconnect(self): when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex] - whenS = log.timestamp(when) if not world.dying: + whenS = log.timestamp(when) log.info('Scheduling reconnect to %s at %s', self.server, whenS) schedule.addEvent(self.reconnect, when)