Merge pull request #201 from OpenKMIP/bug/fix-client-open-error-handling

Fixing potential undefined variable error in client open
This commit is contained in:
Peter Hamilton 2016-11-11 16:27:36 -05:00 committed by GitHub
commit 2a7c45e97a

View File

@ -210,6 +210,8 @@ class KMIPProxy(KMIP):
self.logger.debug("KMIPProxy suppress_ragged_eofs: {0}".format( self.logger.debug("KMIPProxy suppress_ragged_eofs: {0}".format(
self.suppress_ragged_eofs)) self.suppress_ragged_eofs))
last_error = None
for host in self.host_list: for host in self.host_list:
self.host = host self.host = host
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -221,11 +223,13 @@ class KMIPProxy(KMIP):
self.logger.error("An error occurred while connecting to " self.logger.error("An error occurred while connecting to "
"appliance " + self.host) "appliance " + self.host)
self.socket.close() self.socket.close()
last_error = e
else: else:
return return
self.socket = None self.socket = None
raise e if last_error:
raise last_error
def _create_socket(self, sock): def _create_socket(self, sock):
self.socket = ssl.wrap_socket( self.socket = ssl.wrap_socket(