openstack/deb-python-pykmip
Code Issues Proposed changes

Merge pull request #220 from OpenKMIP/bug/fix-server-failure-on-bad-cert

Browse Source 
Fixes premature server shutdown on receiving invalid certificate
This commit is contained in:
Peter Hamilton
2016-12-01 15:02:39 -05:00
committed by GitHub
parent cba8757f63 94aacc1897
commit 243d5aa9c3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kmip/services/server/server.py
View File

@@ -298,12 +298,12 @@ class KmipServer(object):
except socket.error as e: except socket.error as e:
if e.errno == errno.EINTR: if e.errno == errno.EINTR:
self._logger.warning("Interrupting connection service.") self._logger.warning("Interrupting connection service.")
break
else: else:
self._logger.warning( self._logger.warning(
"Error detected while establishing new connection." "Error detected while establishing new connection."
) )
self._logger.exception(e) self._logger.exception(e)
break
except Exception as e: except Exception as e:
self._logger.warning( self._logger.warning(
"Error detected while establishing new connection." "Error detected while establishing new connection."

2
kmip/tests/unit/services/server/test_server.py
View File

@@ -381,7 +381,7 @@ class TestKmipServer(testtools.TestCase):
s._is_serving = True s._is_serving = True
s._logger.reset_mock() s._logger.reset_mock()
s._socket.accept = mock.MagicMock( s._socket.accept = mock.MagicMock(
side_effect=[unexpected_error] side_effect=[unexpected_error, expected_error]
) )
s.serve() s.serve()