From 8fc9b00c03a2731af39cbd2dd5f51c8dafdbffbb Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 3 Dec 2003 22:29:49 +0000 Subject: [PATCH] Don't log the 'scheduling reconnect' message if the world is dying. --- src/asyncoreDrivers.py | 3 ++- src/socketDrivers.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/asyncoreDrivers.py b/src/asyncoreDrivers.py index 3d52b4a49..86122897c 100644 --- a/src/asyncoreDrivers.py +++ b/src/asyncoreDrivers.py @@ -76,7 +76,8 @@ class AsyncoreDriver(asynchat.async_chat, object): def scheduleReconnect(self): when = time.time() + 60 whenS = time.strftime(conf.logTimestampFormat, time.localtime(when)) - log.info('Scheduling reconnect to %s at %s', self.server, whenS) + if not world.dying: + log.info('Scheduling reconnect to %s at %s', self.server, whenS) def makeNewDriver(): self.irc.reset() driver = self.__class__(self.server, self.irc) diff --git a/src/socketDrivers.py b/src/socketDrivers.py index 81d899b75..3dce9100f 100644 --- a/src/socketDrivers.py +++ b/src/socketDrivers.py @@ -45,6 +45,7 @@ from itertools import imap import log import conf +import world import drivers import ircmsgs import schedule @@ -134,7 +135,8 @@ class SocketDriver(drivers.IrcDriver): self.connected = False when = time.time() + self.reconnectWaits[self.reconnectWaitsIndex] whenS = time.strftime(conf.logTimestampFormat, time.localtime(when)) - log.info('Scheduling reconnect to %s at %s', self.server, whenS) + if not world.dying: + log.info('Scheduling reconnect to %s at %s', self.server, whenS) schedule.addEvent(self.reconnect, when) def name(self):