Skip to content
Snippets Groups Projects
Commit f069a78d authored by Eric S. Raymond's avatar Eric S. Raymond
Browse files

Fix a bug in the termination code.

parent 0fca10af
Branches
No related tags found
No related merge requests found
...@@ -149,8 +149,8 @@ class Irker: ...@@ -149,8 +149,8 @@ class Irker:
del self.countmap[(servername, port)] del self.countmap[(servername, port)]
for val in self.sessions.values(): for val in self.sessions.values():
if (val.servername, val.port) == (servername, port): if (val.servername, val.port) == (servername, port):
self.sessions[servername].terminate() self.sessions[val.url].terminate()
del self.sessions[servername] del self.sessions[val.url]
def _handle_ping(self, connection, event): def _handle_ping(self, connection, event):
"PING arrived, bump the last-received time for the connection." "PING arrived, bump the last-received time for the connection."
for (name, server) in self.sessions.items(): for (name, server) in self.sessions.items():
...@@ -171,13 +171,13 @@ class Irker: ...@@ -171,13 +171,13 @@ class Irker:
else: else:
if type(channels) == type(u""): if type(channels) == type(u""):
channels = [channels] channels = [channels]
for channel in channels: for url in channels:
if type(channel) != type(u""): if type(url) != type(u""):
self.logerr("malformed request - unexpected type: %s" % repr(request)) self.logerr("malformed request - unexpected type: %s" % repr(request))
else: else:
if channel not in self.sessions: if url not in self.sessions:
self.sessions[channel] = Session(self, channel) self.sessions[url] = Session(self, url)
self.sessions[channel].enqueue(message) self.sessions[url].enqueue(message)
except ValueError: except ValueError:
self.logerr("can't recognize JSON on input: %s" % repr(line)) self.logerr("can't recognize JSON on input: %s" % repr(line))
def terminate(self): def terminate(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment