diff options
| author | Mark Roberts <wizzat@gmail.com> | 2014-09-23 15:13:13 -0700 |
|---|---|---|
| committer | Mark Roberts <wizzat@gmail.com> | 2014-09-23 15:13:13 -0700 |
| commit | c063e30a1202e367f6b0ad76740eba9a8d15aa66 (patch) | |
| tree | b520078cdcf411050889c2346799fa7e9ce6c2cf /kafka/consumer/simple.py | |
| parent | 2e3d6dbde0d7c86a6acd0da9fcf55afd9b648fbe (diff) | |
| parent | 2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9 (diff) | |
| download | kafka-python-c063e30a1202e367f6b0ad76740eba9a8d15aa66.tar.gz | |
Merge pull request #242 from wizzat/pr_225
Resolve merge conflict in PR #225
Diffstat (limited to 'kafka/consumer/simple.py')
| -rw-r--r-- | kafka/consumer/simple.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kafka/consumer/simple.py b/kafka/consumer/simple.py index aa4d752..df975f4 100644 --- a/kafka/consumer/simple.py +++ b/kafka/consumer/simple.py @@ -306,7 +306,7 @@ class SimpleConsumer(Consumer): if self.max_buffer_size is None: buffer_size *= 2 else: - buffer_size = max(buffer_size * 2, + buffer_size = min(buffer_size * 2, self.max_buffer_size) log.warn("Fetch size too small, increase to %d (2x) " "and retry", buffer_size) |