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

Another tool for the dispatcher.

parent 361833f1
No related branches found
No related tags found
No related merge requests found
...@@ -184,7 +184,7 @@ class Irker: ...@@ -184,7 +184,7 @@ class Irker:
thread = threading.Thread(target=self.irc.process_forever) thread = threading.Thread(target=self.irc.process_forever)
self.irc._thread = thread self.irc._thread = thread
thread.start() thread.start()
self.ircds = {} self.servers = {}
def logerr(self, errmsg): def logerr(self, errmsg):
"Log a processing error." "Log a processing error."
sys.stderr.write("irker: " + errmsg + "\n") sys.stderr.write("irker: " + errmsg + "\n")
...@@ -204,6 +204,9 @@ class Irker: ...@@ -204,6 +204,9 @@ class Irker:
"Nick not accepted for this connection." "Nick not accepted for this connection."
if connection.context: if connection.context:
connection.context.handle_badnick() connection.context.handle_badnick()
def drop_server(servername, port):
"Drop a server out of the server map."
del self.servers[(servername, port)]
def handle(self, line): def handle(self, line):
"Perform a JSON relay request." "Perform a JSON relay request."
try: try:
...@@ -224,9 +227,9 @@ class Irker: ...@@ -224,9 +227,9 @@ class Irker:
self.logerr("malformed request - unexpected type: %s" % repr(request)) self.logerr("malformed request - unexpected type: %s" % repr(request))
else: else:
target = Target(url) target = Target(url)
if target.server() not in self.ircds: if target.server() not in self.servers:
self.ircds[target.server()] = Dispatcher(self, target.servername, target.port) self.servers[target.server()] = Dispatcher(self, target.servername, target.port)
self.ircds[target.server()].dispatch(target.channel, message) self.servers[target.server()].dispatch(target.channel, 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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment