diff --git a/rhodecode/lib/celerylib/loader.py b/rhodecode/lib/celerylib/loader.py --- a/rhodecode/lib/celerylib/loader.py +++ b/rhodecode/lib/celerylib/loader.py @@ -118,7 +118,12 @@ celery_app.user_options['preload'].add(p @signals.setup_logging.connect def setup_logging_callback(**kwargs): - ini_file = celery_app.conf['RC_INI_FILE'] + + if 'RC_INI_FILE' in celery_app.conf: + ini_file = celery_app.conf['RC_INI_FILE'] + else: + ini_file = celery_app.user_options['RC_INI_FILE'] + setup_logging(ini_file) @@ -137,7 +142,11 @@ def on_preload_parsed(options, **kwargs) options = parse_ini_vars(ini_vars) celery_app.conf['RC_INI_FILE'] = ini_file + celery_app.user_options['RC_INI_FILE'] = ini_file + celery_app.conf['RC_INI_OPTIONS'] = options + celery_app.user_options['RC_INI_OPTIONS'] = options + setup_logging(ini_file)