diff options
| author | Mark Roberts <wizzat@fb.com> | 2014-09-23 14:12:30 -0700 |
|---|---|---|
| committer | Mark Roberts <wizzat@fb.com> | 2014-09-23 14:12:30 -0700 |
| commit | 2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9 (patch) | |
| tree | 887cd8e9ec1603a959161d5d6834b8eef2e1ab1a /kafka/consumer/simple.py | |
| parent | 29f5619385bd26034a21bfb5fd0b827291adb8e4 (diff) | |
| download | kafka-python-2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9.tar.gz | |
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 dcc71a9..b74924b 100644 --- a/kafka/consumer/simple.py +++ b/kafka/consumer/simple.py @@ -305,7 +305,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) |