From 5e8dc6dcf55890a4e3a214a943ecc655faed3ecc Mon Sep 17 00:00:00 2001 From: Viktor Shlapakov Date: Tue, 24 Mar 2015 22:21:13 +0300 Subject: Fixed tests and other issues after rebase --- kafka/common.py | 1 - kafka/producer/base.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'kafka') 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 -- cgit v1.2.1