Prefix Redis key names

Author: Schweigi

README.md

@@ -131,6 +131,7 @@ The following settings can be used to fine tune django-eb-sqs. Copy them into yo
 - EB_SQS_QUEUE_PREFIX (`eb-sqs-`): Prefix to use for the queues. The prefix is added to the queue name.
 - EB_SQS_REDIS_CLIENT (`None`): Set the Redis connection client (`StrictRedis`)
 - EB_SQS_REDIS_EXPIRY (`604800`): Default expiry time in seconds until a group is removed
+- EB_SQS_REDIS_KEY_PREFIX (`eb-sqs-`): Prefix used for all Redis keys
 - EB_SQS_USE_PICKLE (`False`): Enable to use `pickle` to serialize task parameters. Uses `json` as default.
 
 

eb_sqs/redis/redis_group_client.py

@@ -13,21 +13,30 @@ def __init__(self, redis_client):
         super(RedisGroupClient, self).__init__()
         self._redis_client = redis_client
 
+    def _key_name(self, group_id):
+        # type: (unicode) -> None
+        return '{}{}'.format(settings.REDIS_KEY_PREFIX, group_id)
+
     def add(self, worker_task):
         # type: (WorkerTask) -> None
+        name = self._key_name(worker_task.group_id)
         pipe = self._redis_client.pipeline()
-        pipe.sadd(worker_task.group_id, worker_task.id)\
-            .expire(worker_task.group_id, settings.REDIS_EXPIRY)\
+        pipe.sadd(name, worker_task.id)\
+            .expire(name, settings.REDIS_EXPIRY)\
             .execute()
 
     def remove(self, worker_task):
         # type: (WorkerTask) -> bool
         """
         :return: True if last task in group
         """
-        if self._redis_client.srem(worker_task.group_id, worker_task.id) > 0:
-            return self._redis_client.scard(worker_task.group_id) == 0
+        name = self._key_name(worker_task.group_id)
+        if self._redis_client.srem(name, worker_task.id) > 0:
+            return self._redis_client.scard(name) == 0
+        else:
+            return False
 
     def active_tasks(self, group_id):
         # type: (unicode) -> int
-        return self._redis_client.scard(group_id)
+        name = self._key_name(group_id)
+        return self._redis_client.scard(name)

eb_sqs/settings.py

@@ -20,6 +20,7 @@
 REDIS_CLIENT = getattr(settings, 'EB_SQS_REDIS_CLIENT', None) # type: StrictRedis
 # default: 7 days
 REDIS_EXPIRY = getattr(settings, 'EB_SQS_REDIS_EXPIRY', 3600*24*7) # type: int
+REDIS_KEY_PREFIX = getattr(settings, 'EB_SQS_REDIS_KEY_PREFIX', 'eb-sqs-') # type: string
 
 WORKER_FACTORY = getattr(settings, 'EB_SQS_WORKER_FACTORY', None) # type: WorkerFactory
 

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-eb-sqs',
-    version='0.8',
+    version='0.9',
     package_dir={'eb_sqs': 'eb_sqs'},
     include_package_data=True,
     packages=find_packages(),