Merge branch 'master' into prod-windows

Conflicts:
	kafka/producer.py

1 files changed, 8 insertions, 3 deletions

diff --git a/kafka/producer.py b/kafka/producer.py
index a7bfe28..7ef7896 100644
--- a/kafka/producer.py
+++ b/kafka/producer.py
@@ -7,6 +7,7 @@ import logging
 import sys
 
 from kafka.common import ProduceRequest
+from kafka.common import FailedPayloadsException
 from kafka.protocol import create_message
 from kafka.partitioner import HashedPartitioner
 
@@ -67,7 +68,7 @@ def _send_upstream(topic, queue, client, batch_time, batch_size,
                                         acks=req_acks,
                                         timeout=ack_timeout)
         except Exception as exp:
-            log.error("Error sending message", exc_info=sys.exc_info())
+            log.exception("Unable to send message")
 
 
 class Producer(object):
@@ -140,8 +141,12 @@ class Producer(object):
         else:
             messages = [create_message(m) for m in msg]
             req = ProduceRequest(self.topic, partition, messages)
-            resp = self.client.send_produce_request([req], acks=self.req_acks,
-                                                    timeout=self.ack_timeout)
+            try:
+                resp = self.client.send_produce_request([req], acks=self.req_acks,
+                                                        timeout=self.ack_timeout)
+            except Exception as e:
+                log.exception("Unable to send messages")
+                raise e
         return resp
 
     def stop(self, timeout=1):