ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

SSL works again!

Browse source
This commit is contained in:
Luke Rogers 2013-10-03 16:26:08 +13:00
parent 3e30db26cb
commit b08c0a46a9
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/irc.py
View file

@ -215,8 +215,8 @@ class IRC(object):
self.input_queue = Queue.Queue() self.input_queue = Queue.Queue()
self.output_queue = Queue.Queue() self.output_queue = Queue.Queue()
self.connection = Connection(self.name, self.server, self.port, # create the IRC connection and connect
self.input_queue, self.output_queue) self.connection = self.create_connection()
self.connection.connect() self.connection.connect()
self.set_pass(self.conf.get('server_password')) self.set_pass(self.conf.get('server_password'))
@ -230,6 +230,9 @@ class IRC(object):
self.parse_thread.daemon = True self.parse_thread.daemon = True
self.parse_thread.start() self.parse_thread.start()
def create_connection(self):
return Connection(self.name, self.server, self.port,
self.input_queue, self.output_queue)
def stop(self): def stop(self):
self.connection.stop() self.connection.stop()
@ -281,4 +284,5 @@ class SSLIRC(IRC):
IRC.__init__(self, name, server, nick, port, channels, conf) IRC.__init__(self, name, server, nick, port, channels, conf)
def create_connection(self): def create_connection(self):
return crlf_ssl_tcp(self.name, self.server, self.port, self.ignore_cert_errors) return SSLConnection(self.name, self.server, self.port, self.input_queue,
self.output_queue, self.ignore_cert_errors)