Merge pull request #100 from cosbynator/no_infinite_loops_real

Branch fix: No infinite loops during metadata requests, invalidate metadata more, exception hierarchy

1 files changed, 29 insertions, 6 deletions

diff --git a/kafka/common.py b/kafka/common.py
index 6f0dd32..c0a1a6a 100644
--- a/kafka/common.py
+++ b/kafka/common.py
@@ -69,23 +69,46 @@ class ErrorMapping(object):
 #   Exceptions  #
 #################
 
-class FailedPayloadsException(Exception):
+
+class KafkaError(RuntimeError):
+    pass
+
+
+class KafkaRequestError(KafkaError):
+    pass
+
+
+class KafkaUnavailableError(KafkaError):
+    pass
+
+
+class BrokerResponseError(KafkaError):
     pass
 
-class ConnectionError(Exception):
+
+class PartitionUnavailableError(KafkaError):
+    pass
+
+
+class FailedPayloadsError(KafkaError):
     pass
 
-class BufferUnderflowError(Exception):
+
+class ConnectionError(KafkaError):
+    pass
+
+
+class BufferUnderflowError(KafkaError):
     pass
 
 
-class ChecksumError(Exception):
+class ChecksumError(KafkaError):
     pass
 
 
-class ConsumerFetchSizeTooSmall(Exception):
+class ConsumerFetchSizeTooSmall(KafkaError):
     pass
 
 
-class ConsumerNoMoreData(Exception):
+class ConsumerNoMoreData(KafkaError):
     pass