From 562d672a0cdf279aced674bb5cc769acf6504142 Mon Sep 17 00:00:00 2001 From: Daniel Dourvaris Date: Thu, 11 Aug 2016 02:08:54 +0300 Subject: [PATCH] celery: Reorder celery imports to fix case where celery tasks were being registered before celery config was setup. Added comments to make this clear so we don't chase this problem in the future until it is refactored --- rhodecode/config/environment.py | 11 ++++++++--- rhodecode/config/middleware.py | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rhodecode/config/environment.py b/rhodecode/config/environment.py index 45828976..b20e3056 100644 --- a/rhodecode/config/environment.py +++ b/rhodecode/config/environment.py @@ -34,11 +34,16 @@ from pylons.configuration import PylonsConfig from pylons.error import handle_mako_error from pyramid.settings import asbool -# don't remove this import it does magic for celery -from rhodecode.lib import celerypylons # noqa +# ------------------------------------------------------------------------------ +# CELERY magic until refactor - issue #4163 - import order matters here: +from rhodecode.lib import celerypylons # this must be first, celerypylons + # sets config settings upon import -import rhodecode.lib.app_globals as app_globals +import rhodecode.integrations # any modules using celery task + # decorators should be added afterwards: +# ------------------------------------------------------------------------------ +from rhodecode.lib import app_globals from rhodecode.config import utils from rhodecode.config.routing import make_map from rhodecode.config.jsroutes import generate_jsroutes_content diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index 055d3943..161c436c 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -39,7 +39,6 @@ from routes.middleware import RoutesMiddleware import routes.util import rhodecode -import rhodecode.integrations # do not remove this as it registers celery tasks from rhodecode.config import patches from rhodecode.config.routing import STATIC_FILE_PREFIX from rhodecode.config.environment import (