diff --git a/bernhard/__init__.py b/bernhard/__init__.py index f3d238b..4ac8bd6 100644 --- a/bernhard/__init__.py +++ b/bernhard/__init__.py @@ -89,7 +89,7 @@ def __init__(self, host, port, keyfile=None, certfile=None, ca_certs=None): self.sock = ssl.wrap_socket(self.sock, keyfile=keyfile, certfile=certfile, - cert_reqs=ssl.CERT_REQUIRED, + #cert_reqs=ssl.CERT_REQUIRED, ssl_version=ssl.PROTOCOL_TLSv1, ca_certs=ca_certs) @@ -204,14 +204,23 @@ def raw(self): class Client(object): - def __init__(self, host='127.0.0.1', port=5555, transport=TCPTransport): + def __init__(self, host='127.0.0.1', port=5555, transport=TCPTransport, tls=False, keyfile=None, certfile=None, ca_certs=None): self.host = host self.port = port self.transport = transport self.connection = None + self.tls = tls + if tls: + self.keyfile = keyfile + self.certfile = certfile + self.ca_certs = ca_certs def connect(self): - self.connection = self.transport(self.host, self.port) + if self.tls: + self.connection = self.transport(self.host, self.port, self.keyfile, + self.certfile, self.ca_certs) + else: + self.connection = self.transport(self.host, self.port) def disconnect(self): try: diff --git a/setup.py b/setup.py index ddddb8e..a199aa4 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name = 'bernhard', - version = '0.2.4', + version = '0.2.6', description = 'Python client for Riemann', long_description = long_description, author = 'Benjamin Anderspn', @@ -38,5 +38,5 @@ zip_safe = False, packages = ['bernhard'], include_package_data = True, - install_requires=['protobuf >= 2.4'] + install_requires=['protobuf == 2.6.1'] )