openstack/deb-python-kafka
Code Issues Proposed changes

Merge pull request #242 from wizzat/pr_225

Browse Source 
Resolve merge conflict in PR #225
This commit is contained in:
Mark Roberts
2014-09-23 15:13:13 -07:00
parent 2e3d6dbde0 2fb6e23b32
commit c063e30a12
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kafka/consumer/simple.py
View File

@@ -306,7 +306,7 @@ class SimpleConsumer(Consumer):
if self.max_buffer_size is None: if self.max_buffer_size is None:
buffer_size *= 2 buffer_size *= 2
else: else:
buffer_size = max(buffer_size * 2, buffer_size = min(buffer_size * 2,
self.max_buffer_size) self.max_buffer_size)
log.warn("Fetch size too small, increase to %d (2x) " log.warn("Fetch size too small, increase to %d (2x) "
"and retry", buffer_size) "and retry", buffer_size)