From: Eric S. Raymond Date: Tue, 28 Aug 2012 20:14:45 +0000 (-0400) Subject: We can now negotiate out of nick conficts. X-Git-Tag: 1.0~80 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e7f6cc57ec515f03c26d95fa94fc930369de96ba;p=irker.git We can now negotiate out of nick conficts. --- diff --git a/irker.py b/irker.py index 9c50766..b6cb54d 100755 --- a/irker.py +++ b/irker.py @@ -200,10 +200,10 @@ class Irker: def _handle_welcome(self, connection, event): "Welcome arrived, nick accepted for this connection." connection.nick_accepted = True - self.debug("nick %s accepted" % self.nickname(connection.nick_trial)) + self.debug(1, "nick %s accepted" % self.nickname(connection.nick_trial)) def _handle_badnick(self, connection, event): "Nick not accepted for this connection." - self.debug("nick %s rejected" % self.nickname(connection.nick_trial)) + self.debug(1, "nick %s rejected" % self.nickname(connection.nick_trial)) connection.nick_trial += 1 connection.nick(self.nickname(connection.nick_trial)) def handle(self, line): @@ -261,7 +261,7 @@ if __name__ == '__main__': elif opt == '-V': # Emit version and exit sys.stdout.write("irker version %s\n" % version) sys.exit(0) - irker = Irker(debuglevel=debuglevel, namesuffix=namesuffix) + irker = Irker(debuglevel=debuglevel) tcpserver = SocketServer.TCPServer((host, port), IrkerTCPHandler) udpserver = SocketServer.UDPServer((host, port), IrkerUDPHandler) threading.Thread(target=tcpserver.serve_forever).start()