From bd3e056be49a6d3e7bd2a05302ee427c7e0befc9 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Fri, 20 Aug 2004 22:11:48 +0000 Subject: [PATCH] Let's not try to queue our connect messages if we're zombie. --- src/irclib.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/irclib.py b/src/irclib.py index 389fc49ea..983661710 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -491,14 +491,15 @@ class Irc(IrcCommandDispatcher): self.outstandingPing = False def _queueConnectMessages(self): - if self.password: - log.info('Sending PASS command, not logging the password.') - self.queueMsg(ircmsgs.password(self.password)) - log.info('Queuing NICK command, nick is %s.', self.nick) - self.queueMsg(ircmsgs.nick(self.nick)) - log.info('Queuing USER command, ident is %s, user is %s.', - self.ident, self.user) - self.queueMsg(ircmsgs.user(self.ident, self.user)) + if not self.zombie: + if self.password: + log.info('Sending PASS command, not logging the password.') + self.queueMsg(ircmsgs.password(self.password)) + log.info('Queuing NICK command, nick is %s.', self.nick) + self.queueMsg(ircmsgs.nick(self.nick)) + log.info('Queuing USER command, ident is %s, user is %s.', + self.ident, self.user) + self.queueMsg(ircmsgs.user(self.ident, self.user)) def _getNextNick(self): if self.alternateNicks: @@ -741,6 +742,7 @@ class Irc(IrcCommandDispatcher): world.ircs.remove(self) else: log.warning('Irc object killed twice.') + #utils.stackTrace() def __hash__(self): return id(self)