Browse Source

Fixed typo CELERY_CACHE_OPTIONS -> CELERY_CACHE_BACKEND_OPTIONS

Ask Solem 15 years ago
parent
commit
391efc75d8
2 changed files with 4 additions and 4 deletions
  1. 2 2
      celery/backends/cache.py
  2. 2 2
      celery/conf.py

+ 2 - 2
celery/backends/cache.py

@@ -23,12 +23,12 @@ class CacheBackend(KeyValueStoreBackend):
     _client = None
 
     def __init__(self, expires=conf.TASK_RESULT_EXPIRES,
-            backend=conf.CELERY_CACHE_BACKEND, options={}, **kwargs):
+            backend=conf.CACHE_BACKEND, options={}, **kwargs):
         super(CacheBackend, self).__init__(self, **kwargs)
         if isinstance(expires, timedelta):
             expires = timeutils.timedelta_seconds(expires)
         self.expires = expires
-        self.options = dict(conf.CELERY_CACHE_BACKEND_OPTIONS, options)
+        self.options = dict(conf.CACHE_BACKEND_OPTIONS, options)
         self.backend, _, servers = partition(backend, "://")
         self.servers = servers.split(";")
 

+ 2 - 2
celery/conf.py

@@ -117,8 +117,8 @@ ALWAYS_EAGER = _get("CELERY_ALWAYS_EAGER")
 EAGER_PROPAGATES_EXCEPTIONS = _get("CELERY_EAGER_PROPAGATES_EXCEPTIONS")
 RESULT_BACKEND = _get("CELERY_RESULT_BACKEND", compat=["CELERY_BACKEND"])
 CELERY_BACKEND = RESULT_BACKEND # FIXME Remove in 1.4
-CELERY_CACHE_BACKEND = _get("CELERY_CACHE_BACKEND")
-CELERY_CACHE_OPTIONS = _get("CELERY_CACHE_OPTIONS") or {}
+CACHE_BACKEND = _get("CELERY_CACHE_BACKEND")
+CACHE_BACKEND_OPTIONS = _get("CELERY_CACHE_BACKEND_OPTIONS") or {}
 TASK_SERIALIZER = _get("CELERY_TASK_SERIALIZER")
 TASK_RESULT_EXPIRES = _get("CELERY_TASK_RESULT_EXPIRES")
 IGNORE_RESULT = _get("CELERY_IGNORE_RESULT")