diff options
| -rw-r--r-- | kafka/__init__.py | 2 | ||||
| -rw-r--r-- | kafka/consumer/__init__.py | 3 | ||||
| -rw-r--r-- | kafka/consumer/kafka.py (renamed from kafka/consumer/new.py) | 4 | ||||
| -rw-r--r-- | test/test_consumer.py | 3 | ||||
| -rw-r--r-- | test/test_consumer_integration.py | 3 |
5 files changed, 7 insertions, 8 deletions
diff --git a/kafka/__init__.py b/kafka/__init__.py index 58ca619..16b9094 100644 --- a/kafka/__init__.py +++ b/kafka/__init__.py @@ -13,7 +13,7 @@ from kafka.protocol import ( ) from kafka.producer import SimpleProducer, KeyedProducer from kafka.partitioner import RoundRobinPartitioner, HashedPartitioner -from kafka.consumer import SimpleConsumer, MultiProcessConsumer +from kafka.consumer import SimpleConsumer, MultiProcessConsumer, KafkaConsumer __all__ = [ 'KafkaClient', 'KafkaConnection', 'SimpleProducer', 'KeyedProducer', diff --git a/kafka/consumer/__init__.py b/kafka/consumer/__init__.py index d2fa306..935f56e 100644 --- a/kafka/consumer/__init__.py +++ b/kafka/consumer/__init__.py @@ -1,6 +1,7 @@ from .simple import SimpleConsumer from .multiprocess import MultiProcessConsumer +from .kafka import KafkaConsumer __all__ = [ - 'SimpleConsumer', 'MultiProcessConsumer' + 'SimpleConsumer', 'MultiProcessConsumer', 'KafkaConsumer' ] diff --git a/kafka/consumer/new.py b/kafka/consumer/kafka.py index 90770b5..af1a9cf 100644 --- a/kafka/consumer/new.py +++ b/kafka/consumer/kafka.py @@ -103,7 +103,7 @@ class KafkaConsumer(object): Configuration settings can be passed to constructor, otherwise defaults will be used: - client_id='kafka.consumer.XXX', + client_id='kafka.consumer.kafka', group_id=None, fetch_message_max_bytes=1024*1024, fetch_min_bytes=1, @@ -129,7 +129,7 @@ class KafkaConsumer(object): """ Configuration settings can be passed to constructor, otherwise defaults will be used: - client_id='kafka.consumer.XXX', + client_id='kafka.consumer.kafka', group_id=None, fetch_message_max_bytes=1024*1024, fetch_min_bytes=1, diff --git a/test/test_consumer.py b/test/test_consumer.py index b33e537..7b8f370 100644 --- a/test/test_consumer.py +++ b/test/test_consumer.py @@ -2,8 +2,7 @@ from mock import MagicMock from . import unittest -from kafka.consumer import SimpleConsumer -from kafka.consumer.new import KafkaConsumer +from kafka import SimpleConsumer, KafkaConsumer from kafka.common import KafkaConfigurationError class TestKafkaConsumer(unittest.TestCase): diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py index b4af70b..c97081b 100644 --- a/test/test_consumer_integration.py +++ b/test/test_consumer_integration.py @@ -3,12 +3,11 @@ import os from six.moves import xrange -from kafka import SimpleConsumer, MultiProcessConsumer, create_message +from kafka import SimpleConsumer, MultiProcessConsumer, KafkaConsumer, create_message from kafka.common import ( ProduceRequest, ConsumerFetchSizeTooSmall, ConsumerTimeout ) from kafka.consumer.base import MAX_FETCH_BUFFER_SIZE_BYTES -from kafka.consumer.new import KafkaConsumer from test.fixtures import ZookeeperFixture, KafkaFixture from test.testutil import ( |