kallithea Changeset - aa5cd5e44621

Changeset - aa5cd5e44621

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich (mads) - 5 years ago 2021-01-01 18:04:16
mads@kiilerich.com

Grafted from: e2421a84e1f4

celery: always set kallithea.CELERY_APP to a Celery app - it is lazy until it actually is used

3 files changed with 4 insertions and 13 deletions:

kallithea/__init__.py

kallithea/config/app_cfg.py

kallithea/lib/celery_app.py

0 comments (0 inline, 0 general)

kallithea/__init__.py

➞

Show inline comments

@@ @@ -27,23 +27,25 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import platform
 import sys
 import celery
 if sys.version_info < (3, 6):
     raise Exception('Kallithea requires python 3.6 or later')
 VERSION = (0, 6, 99)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
+}
-CELERY_APP = None  # set to Celery app instance if using Celery
+CELERY_APP = celery.Celery()  # needed at import time but is lazy and can be configured later
 CONFIG = {}  # set to tg.config when TG app is initialized and calls app_cfg
 # URL prefix for non repository related links - must start with `/`
 ADMIN_PREFIX = '/_admin'
 URL_SEP = '/'

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -133,13 +133,13 @@ def setup_configuration(app): @@
             sys.exit(1)
     # store some globals into kallithea
     kallithea.DEFAULT_USER_ID = db.User.get_default_user().user_id
     if asbool(config.get('use_celery')):
-        kallithea.CELERY_APP = celery_app.make_app()
+        kallithea.CELERY_APP.config_from_object(celery_app.make_celery_config(config))
     kallithea.CONFIG = config
     load_extensions(root_path=config['here'])
     set_app_settings(config)

kallithea/lib/celery_app.py

➞

Show inline comments

@@ @@ -13,15 +13,12 @@ scope after tg.config has been initializ @@
 To make sure that the config really has been initialized, we check one of the
 mandatory settings.
 """
 import logging
 import celery
 import tg
 class CeleryConfig(object):
     imports = ['kallithea.model.async_tasks']
     task_always_eager = False
 list_config_names = {'imports', 'accept_content'}
@@ @@ -69,14 +66,6 @@ def make_celery_config(config): @@
         elif config_value.lower() in ['true', 'false']:
             celery_value = config_value.lower() == 'true'
         else:
             celery_value = config_value
         setattr(celery_config, celery_key, celery_value)
     return celery_config
 def make_app():
     """Create celery app from the TurboGears configuration file"""
     app = celery.Celery()
     celery_config = make_celery_config(tg.config)
     app.config_from_object(celery_config)
     return app

0 comments (0 inline, 0 general)