Celery wasn't really being properly connected during tests.

[mediagoblin.git] / mediagoblin / celery_setup / __init__.py

diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/celery_setup/__init__.py
index d4f25b079ccfc916a9c58555151bd1108a974deb..e35dbce2d0d35611996e15b9167fe90b16007fda 100644 (file)
--- a/mediagoblin/celery_setup/__init__.py
+++ b/mediagoblin/celery_setup/__init__.py
@@ -17,86 +17,31 @@
 import os
 import sys
 
-from paste.deploy.converters import asbool, asint, aslist
-
-
-KNOWN_CONFIG_BOOLS = [
-    'CELERY_RESULT_PERSISTENT',
-    'CELERY_CREATE_MISSING_QUEUES',
-    'BROKER_USE_SSL', 'BROKER_CONNECTION_RETRY',
-    'CELERY_ALWAYS_EAGER', 'CELERY_EAGER_PROPAGATES_EXCEPTIONS',
-    'CELERY_IGNORE_RESULT', 'CELERY_TRACK_STARTED',
-    'CELERY_DISABLE_RATE_LIMITS', 'CELERY_ACKS_LATE',
-    'CELERY_STORE_ERRORS_EVEN_IF_IGNORED',
-    'CELERY_SEND_TASK_ERROR_EMAILS',
-    'CELERY_SEND_EVENTS', 'CELERY_SEND_TASK_SENT_EVENT',
-    'CELERYD_LOG_COLOR', 'CELERY_REDIRECT_STDOUTS',
-    ]
-
-KNOWN_CONFIG_INTS = [
-    'CELERYD_CONCURRENCY',
-    'CELERYD_PREFETCH_MULTIPLIER',
-    'CELERY_AMQP_TASK_RESULT_EXPIRES',
-    'CELERY_AMQP_TASK_RESULT_CONNECTION_MAX',
-    'REDIS_PORT', 'REDIS_DB',
-    'BROKER_PORT', 'BROKER_CONNECTION_TIMEOUT',
-    'CELERY_BROKER_CONNECTION_MAX_RETRIES',
-    'CELERY_TASK_RESULT_EXPIRES', 'CELERY_MAX_CACHED_RESULTS',
-    'CELERY_DEFAULT_RATE_LIMIT', # ??
-    'CELERYD_MAX_TASKS_PER_CHILD', 'CELERYD_TASK_TIME_LIMIT',
-    'CELERYD_TASK_SOFT_TIME_LIMIT',
-    'MAIL_PORT', 'CELERYBEAT_MAX_LOOP_INTERVAL',
-    ]
-
-KNOWN_CONFIG_FLOATS = [
-    'CELERYD_ETA_SCHEDULER_PRECISION',
-    ]
-
-KNOWN_CONFIG_LISTS = [
-    'CELERY_ROUTES', 'CELERY_IMPORTS',
-    ]
-
-
-## Needs special processing:
-# ADMINS, ???
-# there are a lot more; we should list here or process specially.
-
-
-def asfloat(obj):
-    try:
-        return float(obj)
-    except (TypeError, ValueError), e:
-        raise ValueError(
-            "Bad float value: %r" % obj)
-
 
 MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media']
 
 DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module'
 
+
 def setup_celery_from_config(app_config, global_config,
                              settings_module=DEFAULT_SETTINGS_MODULE,
                              force_celery_always_eager=False,
                              set_environ=True):
     """
-    Take a mediagoblin app config and the global config from a paste
-    factory and try to set up a celery settings module from this.
+    Take a mediagoblin app config and try to set up a celery settings
+    module from this.
 
     Args:
     - app_config: the application config section
-    - global_config: the entire paste config, all sections
+    - global_config: the entire ConfigObj loaded config, all sections
     - settings_module: the module to populate, as a string
-    - 
+    - force_celery_always_eager: whether or not to force celery into
+      always eager mode; good for development and small installs
     - set_environ: if set, this will CELERY_CONFIG_MODULE to the
       settings_module
     """
-    if asbool(app_config.get('use_celery_environment_var')) == True:
-        # Don't setup celery based on our config file.
-        return
-
-    celery_conf_section = app_config.get('celery_section', 'celery')
-    if global_config.has_key(celery_conf_section):
-        celery_conf = global_config[celery_conf_section]
+    if global_config.has_key('celery'):
+        celery_conf = global_config['celery']
     else:
         celery_conf = {}
     
@@ -114,9 +59,9 @@ def setup_celery_from_config(app_config, global_config,
         if celery_settings['BROKER_BACKEND'] == 'mongodb':
             celery_settings['BROKER_HOST'] = app_config['db_host']
     if app_config.has_key('db_port'):
-        celery_mongo_settings['port'] = asint(app_config['db_port'])
+        celery_mongo_settings['port'] = app_config['db_port']
         if celery_settings['BROKER_BACKEND'] == 'mongodb':
-            celery_settings['BROKER_PORT'] = asint(app_config['db_port'])
+            celery_settings['BROKER_PORT'] = app_config['db_port']
     celery_mongo_settings['database'] = app_config.get('db_name', 'mediagoblin')
 
     celery_settings['CELERY_MONGODB_BACKEND_SETTINGS'] = celery_mongo_settings
@@ -124,14 +69,6 @@ def setup_celery_from_config(app_config, global_config,
     # Add anything else
     for key, value in celery_conf.iteritems():
         key = key.upper()
-        if key in KNOWN_CONFIG_BOOLS:
-            value = asbool(value)
-        elif key in KNOWN_CONFIG_INTS:
-            value = asint(value)
-        elif key in KNOWN_CONFIG_FLOATS:
-            value = asfloat(value)
-        elif key in KNOWN_CONFIG_LISTS:
-            value = aslist(value)
         celery_settings[key] = value
 
     # add mandatory celery imports