Fix overzealous conversion of 'SSL" to 'TLS' in previous commit.
Previous commit broke SocketService because it accidentally converted `ssl.SSLError` to `ssl.TLSError`.
Austin S. Hemmelgarn committed
May 3, 2018 at 08:42 UTC
58b3814d0d8f8d97c7c2420779d58e3ab6fd5723
1 file changed
+2
-2
python.d/python_modules/bases/FrameworkServices/SocketService.py
+2
-2
@@ -74,7 +74,7 @@ class SocketService(SimpleService):
74
certfile=self.cert,
75
server_side=False,
76
cert_reqs=ssl.CERT_NONE)
77
- except (socket.error, ssl.TLSError) as error:
77
+ except (socket.error, ssl.SSLError) as error:
78
self.error('Failed to wrap socket.')
79
self._disconnect()
80
self.__socket_config = None
@@ -83,7 +83,7 @@ class SocketService(SimpleService):
83
try:
84
self.debug('connecting socket to "{address}", port {port}'.format(address=sa[0], port=sa[1]))
85
self._sock.connect(sa)
86
- except (socket.error, ssl.TLSError) as error:
86
+ except (socket.error, ssl.SSLError) as error:
87
self.error('Failed to connect to "{address}", port {port}, error: {error}'.format(address=sa[0],
88
port=sa[1],
89
error=error))