summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkierkegaard13 <kierkegaard13@gmail.com>2016-09-15 18:28:59 -0500
committerDana Powers <dana.powers@gmail.com>2016-09-15 16:28:59 -0700
commit1646edf7ff6430022acf1c41ca32dd88b971c0cb (patch)
treeedf1870d9f974842089a4d61f76b0979f164f82c
parent1937ce59b4706b44091bb536a9b810ae657c3225 (diff)
downloadkafka-python-1646edf7ff6430022acf1c41ca32dd88b971c0cb.tar.gz
Added ssl_password config option to KafkaProducer class, identical to… (#830)
* Added ssl_password config option to KafkaProducer class, identical to option in KafkaConsumer class * removed non-ascii characters * changed - to : in comments
-rw-r--r--kafka/client_async.py2
-rw-r--r--kafka/producer/kafka.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/kafka/client_async.py b/kafka/client_async.py
index ce1d13b..0849c7b 100644
--- a/kafka/client_async.py
+++ b/kafka/client_async.py
@@ -136,6 +136,8 @@ class KafkaClient(object):
establish the certificate's authenticity. default: none.
ssl_keyfile (str): optional filename containing the client private key.
default: none.
+ ssl_password (str): optional password to be used when loading the
+ certificate chain. default: none.
ssl_crlfile (str): optional filename containing the CRL to check for
certificate expiration. By default, no CRL check is done. When
providing a file, only the leaf certificate will be checked against
diff --git a/kafka/producer/kafka.py b/kafka/producer/kafka.py
index 3927a72..b13db86 100644
--- a/kafka/producer/kafka.py
+++ b/kafka/producer/kafka.py
@@ -216,6 +216,8 @@ class KafkaProducer(object):
establish the certificate's authenticity. default: none.
ssl_keyfile (str): optional filename containing the client private key.
default: none.
+ ssl_password (str): optional password to be used when loading the
+ certificate chain. default: none.
ssl_crlfile (str): optional filename containing the CRL to check for
certificate expiration. By default, no CRL check is done. When
providing a file, only the leaf certificate will be checked against
@@ -280,6 +282,7 @@ class KafkaProducer(object):
'ssl_certfile': None,
'ssl_keyfile': None,
'ssl_crlfile': None,
+ 'ssl_password': None,
'api_version': None,
'api_version_auto_timeout_ms': 2000,
'metric_reporters': [],