summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatus Valo <matusvalo@users.noreply.github.com>2020-09-08 14:10:08 +0200
committerAsif Saif Uddin <auvipy@gmail.com>2020-09-08 18:55:54 +0600
commit56e88dc275831196ca396fce81275ac687d1207b (patch)
treebd09cb6b3fecf698b61732cbe71bf5053773854a
parenta042d57c575092ab131d2609d1d9523991d42e34 (diff)
downloadkombu-56e88dc275831196ca396fce81275ac687d1207b.tar.gz
Revert "Added redis transport key_prefix from envvars"
This reverts commit d440278cd3277060bb80d84234e5ab173f50a885.
-rw-r--r--kombu/transport/redis.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index 67978547..3dca36db 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -1,6 +1,5 @@
"""Redis transport."""
-import os
import numbers
import socket
@@ -56,10 +55,6 @@ Cannot route message for exchange {0!r}: Table empty or key no longer exists.
Probably the key ({1!r}) has been removed from the Redis database.
"""
-KEY_PREFIX = os.environ.get('KOMBU_REDIS_PREFIX', '')
-if KEY_PREFIX:
- KEY_PREFIX = '{p}:'.format(p=KEY_PREFIX)
-
# This implementation may seem overly complex, but I assure you there is
# a good reason for doing it this way.
#
@@ -408,16 +403,16 @@ class Channel(virtual.Channel):
_subclient = None
_closing = False
supports_fanout = True
- keyprefix_queue = '{p}_kombu.binding.%s'.format(p=KEY_PREFIX)
+ keyprefix_queue = '_kombu.binding.%s'
keyprefix_fanout = '/{db}.'
sep = '\x06\x16'
_in_poll = False
_in_listen = False
_fanout_queues = {}
ack_emulation = True
- unacked_key = '{p}unacked'.format(p=KEY_PREFIX)
- unacked_index_key = '{p}unacked_index'.format(p=KEY_PREFIX)
- unacked_mutex_key = '{p}unacked_mutex'.format(p=KEY_PREFIX)
+ unacked_key = 'unacked'
+ unacked_index_key = 'unacked_index'
+ unacked_mutex_key = 'unacked_mutex'
unacked_mutex_expire = 300 # 5 minutes
unacked_restore_limit = None
visibility_timeout = 3600 # 1 hour