3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 20:22:45 +01:00

Irc: catch OSError when reading SSL cert/key files

(ref: #80)
This commit is contained in:
James Lu 2015-08-12 02:01:17 -07:00
parent d9f5cdfeaf
commit 7bccb37ddf

12
main.py
View File

@ -89,7 +89,17 @@ class Irc():
certfile = self.serverdata.get('ssl_certfile') certfile = self.serverdata.get('ssl_certfile')
keyfile = self.serverdata.get('ssl_keyfile') keyfile = self.serverdata.get('ssl_keyfile')
if certfile and keyfile: if certfile and keyfile:
self.socket = ssl.wrap_socket(self.socket, certfile=certfile, keyfile=keyfile) try:
self.socket = ssl.wrap_socket(self.socket,
certfile=certfile,
keyfile=keyfile)
except OSError:
log.exception('(%s) Caught OSError trying to '
'initialize the SSL connection; '
'are "ssl_certfile" and '
'"ssl_keyfile" set correctly?',
self.name)
checks_ok = False
else: else:
log.error('(%s) SSL certfile/keyfile was not set ' log.error('(%s) SSL certfile/keyfile was not set '
'correctly, aborting... ', self.name) 'correctly, aborting... ', self.name)