From 24f931db828e3cda6e140c7587686cf81497e81a Mon Sep 17 00:00:00 2001 From: Tyler Hardison Date: Thu, 27 Apr 2023 10:13:19 -0700 Subject: [PATCH] use the new redis clustering module --- celery_redis_cluster_backend/redis_cluster.py | 14 ++------------ requirments.txt | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/celery_redis_cluster_backend/redis_cluster.py b/celery_redis_cluster_backend/redis_cluster.py index cc5b003..1bc0597 100644 --- a/celery_redis_cluster_backend/redis_cluster.py +++ b/celery_redis_cluster_backend/redis_cluster.py @@ -25,7 +25,7 @@ from celery.backends.base import KeyValueStoreBackend # try: -from rediscluster.client import RedisCluster +import redis # from kombu.transport.redis import get_redis_error_classes # except ImportError: # pragma: no cover # RedisCluster = None # noqa @@ -34,10 +34,6 @@ __all__ = ['RedisClusterBackend'] -REDIS_MISSING = """\ -You need to install the redis-py-cluster library in order to use \ -the Redis result store backend.""" - logger = get_logger(__name__) error = logger.error @@ -45,9 +41,6 @@ class RedisClusterBackend(KeyValueStoreBackend): """Redis task result store.""" - #: redis client module. - redis = RedisCluster - startup_nodes = None max_connections = None init_slot_cache = True @@ -60,9 +53,6 @@ def __init__(self, *args, **kwargs): super(RedisClusterBackend, self).__init__(expires_type=int, **kwargs) conf = self.app.conf - if self.redis is None: - raise ImproperlyConfigured(REDIS_MISSING) - # For compatibility with the old REDIS_* configuration keys. def _get(key): for prefix in 'CELERY_REDIS_{0}', 'REDIS_{0}': @@ -209,7 +199,7 @@ def _new_chord_return(self, task, state, result, propagate=None, @cached_property def client(self): - return RedisCluster(**self.conn_params) + return redis.RedisCluster(**self.conn_params) def __reduce__(self, args=(), kwargs={}): return super(RedisClusterBackend, self).__reduce__( diff --git a/requirments.txt b/requirments.txt index 73a373f..612c228 100644 --- a/requirments.txt +++ b/requirments.txt @@ -1,2 +1,2 @@ celery==5.2.7 -redis-py-cluster==2.1.3 \ No newline at end of file +redis==4.5.1 \ No newline at end of file