Revert "Lower the default to .25, which is pika's default."

This reverts commit 1715799.
python-beaver · Sep 11, 2015 · fe8b5b1 · fe8b5b1
1 parent 1715799
commit fe8b5b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/beaver/config.py b/beaver/config.py
@@ -84,7 +84,7 @@ def __init__(self, args, logger=None):
             'rabbitmq_ha_queue': os.environ.get('RABBITMQ_HA_QUEUE', '0'),
             'rabbitmq_key': os.environ.get('RABBITMQ_KEY', 'logstash-key'),
             'rabbitmq_exchange': os.environ.get('RABBITMQ_EXCHANGE', 'logstash-exchange'),
-            'rabbitmq_timeout': '.25',
+            'rabbitmq_timeout': '2',
             'rabbitmq_delivery_mode': 1,
             'redis_url': os.environ.get('REDIS_URL', 'redis://localhost:6379/0'),
             'redis_namespace': os.environ.get('REDIS_NAMESPACE', 'logstash:beaver'),
@@ -101,10 +101,10 @@ def __init__(self, args, logger=None):
             'sqs_aws_region': 'us-east-1',
             'sqs_aws_queue': '',
             'sqs_aws_queue_owner_acct_id': '',
-            'kinesis_aws_access_key': '',
-            'kinesis_aws_secret_key': '',
-            'kinesis_aws_region': 'us-east-1',
-            'kinesis_aws_stream': '',
+            'kinesis_aws_access_key': '', 
+            'kinesis_aws_secret_key': '', 
+            'kinesis_aws_region': 'us-east-1', 
+            'kinesis_aws_stream': '', 
             'kinesis_aws_batch_size_max': '512000',
             'tcp_host': '127.0.0.1',
             'tcp_port': '9999',

diff --git a/docs/user/usage.rst b/docs/user/usage.rst
@@ -72,7 +72,7 @@ Beaver can optionally get data from a ``configfile`` using the ``-c`` flag. This
 * rabbitmq_exchange_durable: Default ``0``.
 * rabbitmq_key: Default ``logstash-key``.
 * rabbitmq_exchange: Default ``logstash-exchange``.
-* rabbitmq_timeout: Default ``.25``. The timeout in seconds for the connection to the RabbitMQ broker
+* rabbitmq_timeout: Default ``2``. The timeout in seconds for the connection to the RabbitMQ broker
 * 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