summaryrefslogtreecommitdiff
path: root/kafka
diff options
context:
space:
mode:
Diffstat (limited to 'kafka')
-rw-r--r--kafka/common.py1
-rw-r--r--kafka/producer/base.py2
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