diff options
Diffstat (limited to 'mediagoblin/init/celery')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 19c13f7d..780e0055 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -19,6 +19,8 @@ import sys import datetime import logging +import six + from celery import Celery from mediagoblin.tools.pluginapi import hook_runall @@ -48,7 +50,7 @@ def get_celery_settings_dict(app_config, global_config, celery_settings = {} # Add all celery settings from config - for key, value in celery_conf.iteritems(): + for key, value in six.iteritems(celery_conf): celery_settings[key] = value # TODO: use default result stuff here if it exists @@ -67,7 +69,7 @@ def get_celery_settings_dict(app_config, global_config, frequency = int(frequency) celery_settings['CELERYBEAT_SCHEDULE'] = { 'garbage-collection': { - 'task': 'mediagoblin.submit.task.garbage_collection', + 'task': 'mediagoblin.submit.task.collect_garbage', 'schedule': datetime.timedelta(minutes=frequency), } } @@ -113,7 +115,7 @@ def setup_celery_from_config(app_config, global_config, __import__(settings_module) this_module = sys.modules[settings_module] - for key, value in celery_settings.iteritems(): + for key, value in six.iteritems(celery_settings): setattr(this_module, key, value) if set_environ: |