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

Preparing IRC setup.

parent 6934eb31
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,8 @@ class SessionException(exceptions.Exception): ...@@ -18,7 +18,8 @@ class SessionException(exceptions.Exception):
class Session(): class Session():
"IRC session and message queue processing." "IRC session and message queue processing."
def __init__(self, url): count = 1
def __init__(self, ircserver, url):
self.url = url self.url = url
# The consumer thread # The consumer thread
self.queue = Queue.Queue() self.queue = Queue.Queue()
...@@ -38,9 +39,10 @@ class Session(): ...@@ -38,9 +39,10 @@ class Session():
raise SessionException("invalid port number") raise SessionException("invalid port number")
else: else:
self.port = 6667 self.port = 6667
(self.server, self.channel) = parts[0].split("/", 1) (self.servername, self.channel) = parts[0].split("/", 1)
# Client setup # Client setup
self.client = irclib.SimpleIRCClient() #self.ircserver.connect(self.servername, self.port, "irk"+str(Session.count))
Session.count += 1
def enqueue(self, message): def enqueue(self, message):
"Enque a message for transmission." "Enque a message for transmission."
self.queue.put(message) self.queue.put(message)
...@@ -60,6 +62,7 @@ class Session(): ...@@ -60,6 +62,7 @@ class Session():
class Irker: class Irker:
"Persistent IRC multiplexer." "Persistent IRC multiplexer."
def __init__(self): def __init__(self):
self.irc = irclib.IRC()
self.sessions = {} self.sessions = {}
def logerr(self, errmsg): def logerr(self, errmsg):
"Log a processing error." "Log a processing error."
...@@ -86,7 +89,7 @@ class Irker: ...@@ -86,7 +89,7 @@ class Irker:
channel = request['channel'] channel = request['channel']
message = request['message'] message = request['message']
if channel not in self.sessions: if channel not in self.sessions:
self.sessions[channel] = Session(channel) self.sessions[channel] = Session(self.irc.server(), channel)
self.sessions[channel].enqueue(message) self.sessions[channel].enqueue(message)
if __name__ == '__main__': if __name__ == '__main__':
......
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