From eb970c09d79bcd934b2af5f92a9a1fb71ece6da2 Mon Sep 17 00:00:00 2001 From: Ali Afshar Date: Fri, 4 Mar 2005 15:47:22 +0000 Subject: [PATCH] Added check for successful PyOpenSSL import in Twisted driver and increased log level --- src/drivers/Twisted.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/drivers/Twisted.py b/src/drivers/Twisted.py index bb870d885..c8d9b81c0 100644 --- a/src/drivers/Twisted.py +++ b/src/drivers/Twisted.py @@ -44,7 +44,8 @@ from twisted.internet.protocol import ReconnectingClientFactory try: from OpenSSL import SSL except ImportError: - drivers.log.debug('PyOpenSSL is not available, can not connect to SSL servers.') + drivers.log.warning('PyOpenSSL is not available, can not connect to SSL servers.') + SSL = None class TwistedRunnerDriver(drivers.IrcDriver): def name(self): @@ -125,10 +126,13 @@ class SupyReconnectingFactory(ReconnectingClientFactory, drivers.ServersMixin): def connectSSL(self, server, port, vhost): """Connect to the server using an SSL socket.""" - drivers.log.debug('Attempting an SSL connection.') - reactor.connectSSL(server, port, self, - ssl.ClientContextFactory(), bindAddress=(vhost, 0)) - + drivers.log.info('Attempting an SSL connection.') + if SSL: + reactor.connectSSL(server, port, self, + ssl.ClientContextFactory(), bindAddress=(vhost, 0)) + else: + drivers.log.error('PyOpenSSL is not available. Not connecting.') + def clientConnectionFailed(self, connector, r): drivers.log.connectError(self.currentServer, errorMsg(r)) (connector.host, connector.port) = self._getNextServer()