Let's not try to queue our connect messages if we're zombie.

This commit is contained in:
Jeremy Fincher 2004-08-20 22:11:48 +00:00
parent 535d872cab
commit bd3e056be4

View File

@ -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)