kallithea Changeset - 046fbed12f70

Changeset - 046fbed12f70

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 6 years ago 2020-02-13 16:41:51
mads@kiilerich.com

Grafted from: e68bb42cb9f1

celery: use celery directly instead of leaky abstraction in celerypylons

Things start making more sense when we remove unnecessary complexity ...

3 files changed with 4 insertions and 13 deletions:

kallithea/bin/kallithea_cli_celery.py

kallithea/controllers/admin/repos.py

kallithea/lib/celerypylons/__init__.py

0 comments (0 inline, 0 general)

kallithea/bin/kallithea_cli_celery.py

➞

Show inline comments

@@ @@ -9,17 +9,17 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import celery.bin.worker
 import click
 import kallithea
 import kallithea.bin.kallithea_cli_base as cli_base
 from kallithea.lib import celerypylons
 @cli_base.register_command(config_file_initialize_app=True)
 @click.argument('celery_args', nargs=-1)
 def celery_run(celery_args):
     """Start Celery worker(s) for asynchronous tasks.
@@ @@ -33,8 +33,8 @@ def celery_run(celery_args): @@
     """
     if not kallithea.CELERY_APP:
         raise Exception('Please set use_celery = true in .ini config '
                         'file before running this command')
-    cmd = celerypylons.worker.worker(kallithea.CELERY_APP)
+    cmd = celery.bin.worker.worker(kallithea.CELERY_APP)
     return cmd.run_from_argv(None, command='celery-run -c CONFIG_FILE --', argv=list(celery_args))

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import traceback
 import celery.result
 import formencode
 from formencode import htmlfill
 from tg import request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPForbidden, HTTPFound, HTTPInternalServerError, HTTPNotFound
@@ @@ -179,15 +180,14 @@ class ReposController(BaseRepoController @@
     @jsonify
     def repo_check(self, repo_name):
         c.repo = repo_name
         task_id = request.GET.get('task_id')
         if task_id and task_id not in ['None']:
             from kallithea.lib import celerypylons
             if kallithea.CELERY_APP:
-                task_result = celerypylons.result.AsyncResult(task_id, app=kallithea.CELERY_APP)
+                task_result = celery.result.AsyncResult(task_id, app=kallithea.CELERY_APP)
                 if task_result.failed():
                     raise HTTPInternalServerError(task_result.traceback)
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:
             if repo.clone_uri:

kallithea/lib/celerypylons/__init__.py

➞

Show inline comments

@@ @@ -12,22 +12,13 @@ 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 celery
 import celery.result as result
 import tg
 from celery.bin import worker
 from celery.task import task
 # mute pyflakes "imported but unused"
 assert result
 assert worker
 assert task
 def celery_config(config):
     """Return Celery config object populated from relevant settings in a config dict, such as tg.config"""
     # Verify .ini file configuration has been loaded

0 comments (0 inline, 0 general)