Browse Source

Adds missing config keys to defaults

Ask Solem 11 years ago
parent
commit
ba37d5dbc8
2 changed files with 5 additions and 4 deletions
  1. 1 0
      celery/app/defaults.py
  2. 4 4
      docs/configuration.rst

+ 1 - 0
celery/app/defaults.py

@@ -102,6 +102,7 @@ NAMESPACES = {
         'CACHE_BACKEND': Option(),
         'CACHE_BACKEND': Option(),
         'CACHE_BACKEND_OPTIONS': Option({}, type='dict'),
         'CACHE_BACKEND_OPTIONS': Option({}, type='dict'),
         'CHORD_PROPAGATES': Option(True, type='bool'),
         'CHORD_PROPAGATES': Option(True, type='bool'),
+        'COUCHBASE_BACKEND_SETTINGS': Option(None, type='dict'),
         'CREATE_MISSING_QUEUES': Option(True, type='bool'),
         'CREATE_MISSING_QUEUES': Option(True, type='bool'),
         'DEFAULT_RATE_LIMIT': Option(type='string'),
         'DEFAULT_RATE_LIMIT': Option(type='string'),
         'DISABLE_RATE_LIMITS': Option(False, type='bool'),
         'DISABLE_RATE_LIMITS': Option(False, type='bool'),

+ 4 - 4
docs/configuration.rst

@@ -668,7 +668,7 @@ Couchbase backend settings
 
 
     The Couchbase backend requires the :mod:`couchbase` library:
     The Couchbase backend requires the :mod:`couchbase` library:
     https://pypi.python.org/pypi/couchbase
     https://pypi.python.org/pypi/couchbase
-    
+
     To install the couchbase package use `pip` or `easy_install`:
     To install the couchbase package use `pip` or `easy_install`:
 
 
     .. code-block:: bash
     .. code-block:: bash
@@ -679,8 +679,8 @@ This backend can be configured via the :setting:`CELERY_RESULT_BACKEND`
 set to a couchbase URL::
 set to a couchbase URL::
 
 
     CELERY_RESULT_BACKEND = "couchbase://username:password@host:port/bucket"
     CELERY_RESULT_BACKEND = "couchbase://username:password@host:port/bucket"
-    
-    
+
+
 .. setting:: CELERY_COUCHBASE_BACKEND_SETTINGS
 .. setting:: CELERY_COUCHBASE_BACKEND_SETTINGS
 
 
 CELERY_COUCHBASE_BACKEND_SETTINGS
 CELERY_COUCHBASE_BACKEND_SETTINGS
@@ -693,7 +693,7 @@ This is a dict supporting the following keys:
 
 
 * port
 * port
     The port the Couchbase server is listening to. Defaults to 8091.
     The port the Couchbase server is listening to. Defaults to 8091.
-    
+
 * bucket
 * bucket
     The default bucket the Couchbase server is writing to. Defaults to "default".
     The default bucket the Couchbase server is writing to. Defaults to "default".