Skip to content

Add channel support to Redis transport #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josegonzalez merged 4 commits into from
Jun 11, 2015
Merged

Add channel support to Redis transport #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1de6db1
Add channel support to Redis transport
hectcastro Jun 10, 2015
b970bda
Update Redis transport usage documentation
hectcastro Jun 10, 2015
94812db
Move data type method conditional outside of loop
hectcastro Jun 10, 2015
39ee609
Add constants for data types, validate in init, use callback map
hectcastro Jun 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions beaver/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def __init__(self, args, logger=None):
'rabbitmq_delivery_mode': 1,
'redis_url': os.environ.get('REDIS_URL', 'redis://localhost:6379/0'),
'redis_namespace': os.environ.get('REDIS_NAMESPACE', 'logstash:beaver'),
'redis_data_type': os.environ.get('REDIS_DATA_TYPE', 'list'),
'redis_password': '',
'sqs_aws_access_key': '',
'sqs_aws_secret_key': '',
Expand Down
18 changes: 17 additions & 1 deletion beaver/transports/redis_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@


class RedisTransport(BaseTransport):
LIST_DATA_TYPE = 'list'
CHANNEL_DATA_TYPE = 'channel'

def __init__(self, beaver_config, logger=None):
super(RedisTransport, self).__init__(beaver_config, logger=logger)
Expand All @@ -26,6 +28,11 @@ def __init__(self, beaver_config, logger=None):
self._namespace = beaver_config.get('redis_namespace')
self._current_server_index = 0

self._data_type = beaver_config.get('redis_data_type')
if self._data_type not in [self.LIST_DATA_TYPE,
self.CHANNEL_DATA_TYPE]:
raise TransportException('Unknown Redis data type')

self._check_connections()

def _check_connections(self):
Expand Down Expand Up @@ -75,13 +82,22 @@ def callback(self, filename, lines, **kwargs):
namespace = self._namespace
self._logger.debug('Got namespace: ' + namespace)

data_type = self._data_type
self._logger.debug('Got data type: ' + data_type)

server = self._get_next_server()
self._logger.debug('Got redis server: ' + server['url'])

pipeline = server['redis'].pipeline(transaction=False)

callback_map = {
self.LIST_DATA_TYPE: pipeline.rpush,
self.CHANNEL_DATA_TYPE: pipeline.publish,
}
callback_method = callback_map[data_type]

for line in lines:
pipeline.rpush(
callback_method(
namespace,
self.format(filename, line, timestamp, **kwargs)
)
Expand Down
1 change: 1 addition & 0 deletions docs/user/usage.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Beaver can optionally get data from a ``configfile`` using the ``-c`` flag. This
* rabbitmq_delivery_mode: Default ``1``. Message deliveryMode. 1: non persistent 2: persistent
* redis_url: Default ``redis://localhost:6379/0``. Comma separated redis URLs
* redis_namespace: Default ``logstash:beaver``. Redis key namespace
* redis_data_type: Default ``list``, but can also be ``channel``. Redis data type used for transporting log messages
* sqs_aws_access_key: Can be left blank to use IAM Roles or AWS_ACCESS_KEY_ID environment variable (see: https://github.com/boto/boto#getting-started-with-boto)
* sqs_aws_secret_key: Can be left blank to use IAM Roles or AWS_SECRET_ACCESS_KEY environment variable (see: https://github.com/boto/boto#getting-started-with-boto)
* sqs_aws_region: Default ``us-east-1``. AWS Region
Expand Down