Merge branch 'issue-35'

Conflicts:
	kafka/__init__.py
	kafka/consumer.py
	test/test_integration.py

1 files changed, 9 insertions, 0 deletions

diff --git a/kafka/conn.py b/kafka/conn.py
index aba3ada..7103253 100644
--- a/kafka/conn.py
+++ b/kafka/conn.py
@@ -86,3 +86,12 @@ class KafkaConnection(local):
     def close(self):
         "Close this connection"
         self._sock.close()
+
+    def reinit(self):
+        """
+        Re-initialize the socket connection
+        """
+        self._sock.close()
+        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self._sock.connect((self.host, self.port))
+        self._sock.settimeout(10)