Skip to content

Add arbitrary rabbitmq args #431

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 2 commits into from
Oct 14, 2018
Merged

Add arbitrary rabbitmq args #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c030109
Add arbitrary RabbitMQ arguments
Oct 14, 2018
37dd76a
Fix typo in RABBITMQ_ARGUMENT system property
Oct 14, 2018
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
2 changes: 2 additions & 0 deletions beaver/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def __init__(self, args, logger=None):
'rabbitmq_exchange_durable': os.environ.get('RABBITMQ_EXCHANGE_DURABLE', '0'),
'rabbitmq_queue_durable': os.environ.get('RABBITMQ_QUEUE_DURABLE', '0'),
'rabbitmq_ha_queue': os.environ.get('RABBITMQ_HA_QUEUE', '0'),
'rabbitmq_arguments': os.environ.get('RABBITMQ_ARGUMENTS', {}),
'rabbitmq_key': os.environ.get('RABBITMQ_KEY', 'logstash-key'),
'rabbitmq_exchange': os.environ.get('RABBITMQ_EXCHANGE', 'logstash-exchange'),
'rabbitmq_timeout': '1',
Expand Down Expand Up @@ -248,6 +249,7 @@ def use_ssh_tunnel(self):

def _check_for_deprecated_usage(self):
env_vars = [
'RABBITMQ_ARGUMENTS'
'RABBITMQ_HOST',
'RABBITMQ_PORT',
'RABBITMQ_VHOST',
Expand Down
24 changes: 22 additions & 2 deletions beaver/transports/rabbitmq_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ def __init__(self, beaver_config, logger=None):
config_to_store = [
'key', 'exchange', 'username', 'password', 'host', 'port', 'vhost',
'queue', 'queue_durable', 'ha_queue', 'exchange_type', 'exchange_durable',
'ssl', 'ssl_key', 'ssl_cert', 'ssl_cacert', 'timeout', 'delivery_mode'
'ssl', 'ssl_key', 'ssl_cert', 'ssl_cacert', 'timeout', 'delivery_mode', 'arguments'
]

for key in config_to_store:
self._rabbitmq_config[key] = beaver_config.get('rabbitmq_' + key)
if self._rabbitmq_config['arguments']:
self._rabbitmq_config['arguments'] = self.get_rabbitmq_args()
if self._rabbitmq_config['ha_queue']:
self._rabbitmq_config['arguments']['x-ha-policy'] = 'all'



self._connection = None
self._channel = None
Expand All @@ -33,6 +39,20 @@ def __init__(self, beaver_config, logger=None):
self._is_valid = True
self._connect()

def get_rabbitmq_args(self):
res = {}
args = self._rabbitmq_config['arguments'].split(',')
for x in args:
k, v = x.split(':')
try:
# convert str to int if not a str
v = int(v)
except ValueError:
pass # is a str, not an int
res[k] = v
return res


def _on_connection_open(self,connection):
self._logger.debug("RabbitMQ: Connection Created")
self._channel = connection.channel(self._on_channel_open)
Expand All @@ -49,7 +69,7 @@ def _on_exchange_declareok(self,unused):
self._channel.queue_declare(self._on_queue_declareok,
queue=self._rabbitmq_config['queue'],
durable=self._rabbitmq_config['queue_durable'],
arguments={'x-ha-policy': 'all'} if self._rabbitmq_config['ha_queue'] else {})
arguments=self._rabbitmq_config['arguments'])

def _on_queue_declareok(self,unused):
self._logger.debug("RabbitMQ: Queue Declared")
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 @@ -58,6 +58,7 @@ Beaver can optionally get data from a ``configfile`` using the ``-c`` flag. This
* mqtt_keepalive: Default ``60``. mqtt keepalive ping
* mqtt_topic: Default ``/logstash``. Topic to publish to
* number_of_consumer_processes: Default ``1``. Number of parallel consumer processes that read and process messages from the beaver queue.
* rabbitmq_arguments: Defaults ``{}``. RabbitMQ arguments comma separated, colon separated key value pairs. i.e ``rabbitmq_arguments: x-max-length:750000,x-max-length-bytes:1073741824``
* rabbitmq_host: Defaults ``localhost``. Host for RabbitMQ
* rabbitmq_port: Defaults ``5672``. Port for RabbitMQ
* rabbitmq_ssl: Defaults ``0``. Connect using SSL/TLS
Expand Down