jgaunt/pykmip
2
0
Fork 0
mirror of https://github.com/openkmip/pykmip synced 2025-12-16 16:24:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #446 from tipabu/improved-errors-and-logging

Browse Source 
Improve errors and logging
This commit is contained in:
Peter Hamilton
2018-06-28 11:23:11 -04:00
committed by GitHub
parent 4e138207af 8bf7592db9
commit a931850c51
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kmip/pie/client.py
View File

@@ -93,7 +93,7 @@ class ProxyKmipClient(object):
Optional, defaults to None. Optional, defaults to None.
""" """
self.logger = logging.getLogger() self.logger = logging.getLogger(__name__)
self.attribute_factory = attributes.AttributeFactory() self.attribute_factory = attributes.AttributeFactory()
self.object_factory = factory.ObjectFactory() self.object_factory = factory.ObjectFactory()
@@ -131,7 +131,7 @@ class ProxyKmipClient(object):
self.proxy.open() self.proxy.open()
self._is_open = True self._is_open = True
except Exception as e: except Exception as e:
self.logger.exception("could not open client connection", e) self.logger.error("could not open client connection: %s", e)
raise raise
def close(self): def close(self):
@@ -148,7 +148,7 @@ class ProxyKmipClient(object):
self.proxy.close() self.proxy.close()
self._is_open = False self._is_open = False
except Exception as e: except Exception as e:
self.logger.exception("could not close client connection", e) self.logger.error("could not close client connection: %s", e)
raise raise
@is_connected @is_connected

7
kmip/services/kmip_client.py
View File

@@ -62,6 +62,7 @@ import os
import six import six
import socket import socket
import ssl import ssl
import sys
FILE_PATH = os.path.dirname(os.path.abspath(__file__)) FILE_PATH = os.path.dirname(os.path.abspath(__file__))
CONFIG_FILE = os.path.normpath(os.path.join(FILE_PATH, '../kmipconfig.ini')) CONFIG_FILE = os.path.normpath(os.path.join(FILE_PATH, '../kmipconfig.ini'))
@@ -224,15 +225,15 @@ class KMIPProxy:
self.socket.connect((self.host, self.port)) self.socket.connect((self.host, self.port))
except Exception as e: except Exception as e:
self.logger.error("An error occurred while connecting to " self.logger.error("An error occurred while connecting to "
"appliance " + self.host) "appliance %s: %s", self.host, e)
self.socket.close() self.socket.close()
last_error = e last_error = sys.exc_info()
else: else:
return return
self.socket = None self.socket = None
if last_error: if last_error:
raise last_error six.reraise(*last_error)
def _create_socket(self, sock): def _create_socket(self, sock):
self.socket = ssl.wrap_socket( self.socket = ssl.wrap_socket(