# HG changeset patch # User RhodeCode Admin # Date 2024-02-13 13:40:48 # Node ID b35336c87917d11d5a011b03f768f3053522d647 # Parent 79967b24a7d49fbe052ba3cd91895e65eacd3918 chore(deps): bumped celery to 5.3.6 and kombu to latest version diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ async-timeout==4.0.3 atomicwrites==1.4.1 -celery==5.3.4 - billiard==4.1.0 +celery==5.3.6 + billiard==4.2.0 click==8.1.3 click-didyoumean==0.3.0 click==8.1.3 @@ -14,8 +14,8 @@ celery==5.3.4 prompt-toolkit==3.0.38 wcwidth==0.2.6 six==1.16.0 - kombu==5.3.2 - amqp==5.1.1 + kombu==5.3.5 + amqp==5.2.0 vine==5.1.0 vine==5.1.0 python-dateutil==2.8.2 diff --git a/vcsserver/hooks.py b/vcsserver/hooks.py --- a/vcsserver/hooks.py +++ b/vcsserver/hooks.py @@ -20,7 +20,6 @@ import os import sys import logging import collections -import importlib import base64 import msgpack import dataclasses @@ -29,7 +28,6 @@ import pygit2 import http.client from celery import Celery - import mercurial.scmutil import mercurial.node @@ -38,7 +36,7 @@ from vcsserver import exceptions, subpro from vcsserver.str_utils import ascii_str, safe_str from vcsserver.remote.git_remote import Repository -celery_app = Celery() +celery_app = Celery('__vcsserver__') log = logging.getLogger(__name__) @@ -94,13 +92,14 @@ class HooksCeleryClient: TASK_TIMEOUT = 60 # time in seconds def __init__(self, queue, backend): - celery_app.config_from_object({'broker_url': queue, 'result_backend': backend, - 'broker_connection_retry_on_startup': True, - 'task_serializer': 'msgpack', - 'accept_content': ['json', 'msgpack'], - 'result_serializer': 'msgpack', - 'result_accept_content': ['json', 'msgpack'] - }) + celery_app.config_from_object({ + 'broker_url': queue, 'result_backend': backend, + 'broker_connection_retry_on_startup': True, + 'task_serializer': 'msgpack', + 'accept_content': ['json', 'msgpack'], + 'result_serializer': 'msgpack', + 'result_accept_content': ['json', 'msgpack'] + }) self.celery_app = celery_app def __call__(self, method, extras):