From 2eac578a5a75e5f8f2afcfdcd18d127c7541e5b3 Mon Sep 17 00:00:00 2001
From: Zack Dever <zackdever@gmail.com>
Date: Mon, 3 Mar 2014 17:48:37 -0800
Subject: nit: fixed misspelling

---
 kafka/conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kafka')

diff --git a/kafka/conn.py b/kafka/conn.py
index 749cc02..7266ae8 100644
--- a/kafka/conn.py
+++ b/kafka/conn.py
@@ -15,7 +15,7 @@ DEFAULT_KAFKA_PORT = 9092
 
 def collect_hosts(hosts, randomize=True):
     """
-    Collects a comma-separated set of hosts (host:port) and optionnaly
+    Collects a comma-separated set of hosts (host:port) and optionally
     randomize the returned list.
     """
 
-- 
cgit v1.2.1


From c4cbe04cf13cc94ea1c72904f2b63b91fb5c0b84 Mon Sep 17 00:00:00 2001
From: stephenarmstrong <stephen.armstrong@linqia.com>
Date: Thu, 13 Mar 2014 15:14:32 -0700
Subject: If a broker refuses the connection, try the next

---
 kafka/client.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kafka')

diff --git a/kafka/client.py b/kafka/client.py
index 96cc1df..a683fe0 100644
--- a/kafka/client.py
+++ b/kafka/client.py
@@ -83,14 +83,14 @@ class KafkaClient(object):
         brokers. Keep trying until you succeed.
         """
         for (host, port) in self.hosts:
-            conn = self._get_conn(host, port)
             try:
+                conn = self._get_conn(host, port)
                 conn.send(requestId, request)
                 response = conn.recv(requestId)
                 return response
             except Exception, e:
-                log.warning("Could not send request [%r] to server %s, "
-                            "trying next server: %s" % (request, conn, e))
+                log.warning("Could not send request [%r] to server %s:%i, "
+                            "trying next server: %s" % (request, host, port, e))
                 continue
 
         raise KafkaUnavailableError("All servers failed to process request")
-- 
cgit v1.2.1


From e08c718ca65c04d012f32e0053e58e851b04f40e Mon Sep 17 00:00:00 2001
From: Saulius Zemaitaitis <saulius@uber.com>
Date: Mon, 17 Mar 2014 17:06:48 +0200
Subject: Check against basestring instead of str in collect.hosts.

---
 kafka/conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kafka')

diff --git a/kafka/conn.py b/kafka/conn.py
index 7266ae8..7538e8d 100644
--- a/kafka/conn.py
+++ b/kafka/conn.py
@@ -19,7 +19,7 @@ def collect_hosts(hosts, randomize=True):
     randomize the returned list.
     """
 
-    if isinstance(hosts, str):
+    if isinstance(hosts, basestring):
         hosts = hosts.strip().split(',')
 
     result = []
-- 
cgit v1.2.1