diff options
| author | Viktor Shlapakov <vshlapakov@gmail.com> | 2015-03-24 22:21:13 +0300 |
|---|---|---|
| committer | Viktor Shlapakov <vshlapakov@gmail.com> | 2015-06-03 11:22:47 +0300 |
| commit | 5e8dc6dcf55890a4e3a214a943ecc655faed3ecc (patch) | |
| tree | f5ec10c67ec6c0e48971e2f973f4768807693ca7 /kafka | |
| parent | b0a04595c6aee7f6fcaa8927fcdfcd9a04a9b7d3 (diff) | |
| download | kafka-python-5e8dc6dcf55890a4e3a214a943ecc655faed3ecc.tar.gz | |
Fixed tests and other issues after rebase
Diffstat (limited to 'kafka')
| -rw-r--r-- | kafka/common.py | 1 | ||||
| -rw-r--r-- | kafka/producer/base.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kafka/common.py b/kafka/common.py index b3380d7..5c2b788 100644 --- a/kafka/common.py +++ b/kafka/common.py @@ -6,7 +6,6 @@ from collections import namedtuple # Structs # ############### -<<<<<<< HEAD # https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol#AGuideToTheKafkaProtocol-MetadataAPI MetadataRequest = namedtuple("MetadataRequest", ["topics"]) diff --git a/kafka/producer/base.py b/kafka/producer/base.py index 44ffdf4..9bfe98b 100644 --- a/kafka/producer/base.py +++ b/kafka/producer/base.py @@ -86,7 +86,7 @@ def _send_upstream(queue, client, codec, batch_time, batch_size, acks=req_acks, timeout=ack_timeout) except FailedPayloadsError as ex: - failed_reqs = ex.args[0] + failed_reqs = ex.failed_payloads log.exception("Failed payloads count %s" % len(failed_reqs)) # if no limit, retry all failed messages until success |