diff options
author | Zack Dever <zdever@pandora.com> | 2016-04-25 14:22:51 -0700 |
---|---|---|
committer | Zack Dever <zdever@pandora.com> | 2016-04-25 14:22:51 -0700 |
commit | 0300edb353e8581e47cb06a3294f9456d4e7ad2d (patch) | |
tree | 5860fd67a712bfdb37d79d3294543c7e958747cf | |
parent | aefafd270a75b9a3d21c148eefba5ba56cbc622b (diff) | |
download | kafka-python-0300edb353e8581e47cb06a3294f9456d4e7ad2d.tar.gz |
use the same logic for callbacks regardless of is_done status
-rw-r--r-- | kafka/future.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/kafka/future.py b/kafka/future.py index 2c8fd86..c22755a 100644 --- a/kafka/future.py +++ b/kafka/future.py @@ -5,6 +5,8 @@ log = logging.getLogger(__name__) class Future(object): + error_on_callbacks = False # and errbacks + def __init__(self): self.is_done = False self.value = None @@ -28,11 +30,7 @@ class Future(object): assert not self.is_done, 'Future is already complete' self.value = value self.is_done = True - for f in self._callbacks: - try: - f(value) - except Exception: - log.exception('Error processing callback') + self._call_backs('callback', self._callbacks, self.value) return self def failure(self, e): @@ -41,18 +39,14 @@ class Future(object): assert isinstance(self.exception, BaseException), ( 'future failed without an exception') self.is_done = True - for f in self._errbacks: - try: - f(self.exception) - except Exception: - log.exception('Error processing errback') + self._call_backs('errback', self._errbacks, self.exception) return self def add_callback(self, f, *args, **kwargs): if args or kwargs: f = functools.partial(f, *args, **kwargs) if self.is_done and not self.exception: - f(self.value) + self._call_backs('callback', [f], self.value) else: self._callbacks.append(f) return self @@ -61,7 +55,7 @@ class Future(object): if args or kwargs: f = functools.partial(f, *args, **kwargs) if self.is_done and self.exception: - f(self.exception) + self._call_backs('callback', [f], self.exception) else: self._errbacks.append(f) return self @@ -75,3 +69,12 @@ class Future(object): self.add_callback(future.success) self.add_errback(future.failure) return self + + def _call_backs(self, back_type, backs, value): + for f in backs: + try: + f(value) + except Exception as e: + log.exception('Error processing %s', back_type) + if self.error_on_callbacks: + raise e |