Merge pull request #179 from jay-instaedu/develop

only log cert errors if not handled by user
This commit is contained in:
Lance Stout 2012-07-05 13:36:53 -07:00
commit c7594b3ef0

View File

@ -537,8 +537,8 @@ class XMLStream(object):
try:
cert.verify(self._expected_server_name, self._der_cert)
except cert.CertificateError as err:
log.error(err.message)
if not self.event_handled('ssl_invalid_cert'):
log.error(err.message)
self.disconnect(send_close=False)
else:
self.event('ssl_invalid_cert',
@ -828,8 +828,8 @@ class XMLStream(object):
try:
cert.verify(self._expected_server_name, self._der_cert)
except cert.CertificateError as err:
log.error(err.message)
if not self.event_handled('ssl_invalid_cert'):
log.error(err.message)
self.disconnect(self.auto_reconnect, send_close=False)
else:
self.event('ssl_invalid_cert', pem_cert, direct=True)