diff --git a/kallithea/bin/kallithea_cli_celery.py b/kallithea/bin/kallithea_cli_celery.py --- a/kallithea/bin/kallithea_cli_celery.py +++ b/kallithea/bin/kallithea_cli_celery.py @@ -17,6 +17,7 @@ import click import kallithea import kallithea.bin.kallithea_cli_base as cli_base +from kallithea.lib.utils2 import asbool @cli_base.register_command(config_file_initialize_app=True) @@ -32,7 +33,7 @@ def celery_run(celery_args): by this CLI command. """ - if not kallithea.CELERY_APP: + if not asbool(kallithea.CONFIG.get('use_celery')): raise Exception('Please set use_celery = true in .ini config ' 'file before running this command') diff --git a/kallithea/lib/celerylib/__init__.py b/kallithea/lib/celerylib/__init__.py --- a/kallithea/lib/celerylib/__init__.py +++ b/kallithea/lib/celerylib/__init__.py @@ -35,7 +35,7 @@ from tg import config import kallithea from kallithea.lib.pidlock import DaemonLock, LockHeld -from kallithea.lib.utils2 import safe_bytes +from kallithea.lib.utils2 import asbool, safe_bytes from kallithea.model import meta @@ -46,7 +46,7 @@ def task(f_org): """Wrapper of celery.task.task, running async if CELERY_APP """ - if kallithea.CELERY_APP: + if asbool(kallithea.CONFIG.get('use_celery')): def f_async(*args, **kwargs): log.info('executing %s task', f_org.__name__) try: diff --git a/kallithea/model/async_tasks.py b/kallithea/model/async_tasks.py --- a/kallithea/model/async_tasks.py +++ b/kallithea/model/async_tasks.py @@ -219,7 +219,7 @@ def get_commits_stats(repo_name, ts_min_ lock.release() # execute another task if celery is enabled - if len(scm_repo.revisions) > 1 and kallithea.CELERY_APP and recurse_limit > 0: + if len(scm_repo.revisions) > 1 and asbool(kallithea.CONFIG.get('use_celery')) and recurse_limit > 0: get_commits_stats(repo_name, ts_min_y, ts_max_y, recurse_limit - 1) elif recurse_limit <= 0: log.debug('Not recursing - limit has been reached')