diff --git a/kuma/wiki/tasks.py b/kuma/wiki/tasks.py index 2fd997ecc69..714ab785521 100644 --- a/kuma/wiki/tasks.py +++ b/kuma/wiki/tasks.py @@ -11,7 +11,6 @@ from django.core.cache import get_cache from constance import config -import waffle from devmo.utils import MemcacheLock from .exceptions import StaleDocumentsRenderingInProgress, PageMoveError @@ -63,15 +62,8 @@ def render_stale_documents(immediate=False, log=None): settings.SITE_URL)) subtasks.append(subtask) log.info("Deferred rendering for stale %s" % doc) - if subtasks: - task_group = group(tasks=subtasks) - if waffle.switch_is_active('render_stale_documents_async'): - # kick off the task group asynchronously - task_group.apply_async() - else: - # kick off the task group synchronously - result = task_group.apply() - response = result.join() + task_group = group(subtasks) + task_group().get() # calling it since async doesn't work finally: lock.release() return response diff --git a/settings_travis.py b/settings_travis.py index 81864b8fe8c..cd9bf9ca398 100644 --- a/settings_travis.py +++ b/settings_travis.py @@ -1,5 +1,6 @@ from settings import * +CELERY_ALWAYS_EAGER = True ASYNC_SIGNALS = False ES_URLS = ['http://localhost:9200'] ES_INDEX_PREFIX = 'mdn'