summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Saryerwinnie <js@jamesls.com>2013-03-21 14:19:21 -0700
committerAsk Solem <ask@celeryproject.org>2013-10-30 14:01:07 +0000
commit9a33208df99731d1ec9e40d4f7fd4b9746650949 (patch)
treec7c238695aa8d7f545f06537c6bcf2d78bf35b05
parent8ad871ad204f20dbadb8e061a1824b81fd4e30e1 (diff)
downloadkombu-2.5-archived.tar.gz
Add the defaults back to SQS2.5-archived2.5
Conflicts: kombu/transport/SQS.py
-rw-r--r--kombu/transport/SQS.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/kombu/transport/SQS.py b/kombu/transport/SQS.py
index f06f596f..839979dd 100644
--- a/kombu/transport/SQS.py
+++ b/kombu/transport/SQS.py
@@ -132,8 +132,7 @@ class Channel(virtual.Channel):
default_region = 'us-east-1'
default_visibility_timeout = 1800 # 30 minutes.
- # 20 seconds is the max value currently supported by SQS.
- default_wait_time_seconds = 1 # disabled: see Issue #198
+ default_wait_time_seconds = 0 # disabled see #198
domain_format = 'kombu%(vhost)s'
_sdb = None
_sqs = None
@@ -378,8 +377,8 @@ class Channel(virtual.Channel):
class Transport(virtual.Transport):
Channel = Channel
- polling_interval = 0
- wait_time_seconds = 20
+ polling_interval = 1
+ wait_time_seconds = 0
default_port = None
connection_errors = (StdConnectionError, exception.SQSError, socket.error)
channel_errors = (exception.SQSDecodeError, StdChannelError)