github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-03-18 11:02:09 +00:00
Code Issues Projects Releases Wiki Activity

perf: update celery service run

Browse Source
This commit is contained in:
ibuler
2026-03-17 16:17:15 +08:00
parent bf9b88cb63
commit a1d086882c
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/management/commands/services/command.py
View File

@@ -23,6 +23,7 @@ class Services(TextChoices):
gunicorn = 'gunicorn', 'gunicorn'
celery_ansible = 'celery_ansible', 'celery_ansible'
celery_default = 'celery_default', 'celery_default'
celery_combine = 'celery_combine', 'celery_combine'
beat = 'beat', 'beat'
flower = 'flower', 'flower'
ws = 'ws', 'ws'
@@ -39,21 +40,22 @@ class Services(TextChoices):
cls.flower: services.FlowerService,
cls.celery_default: services.CeleryDefaultService,
cls.celery_ansible: services.CeleryAnsibleService,
cls.celery_combine: services.CeleryCombineService,
cls.beat: services.BeatService,
}
return services_map.get(name)
@classmethod
def web_services(cls):
if SERVER_SIZE == 'small' or os.environ.get('FLOWER_DIABLED', '0') == '1':
if SERVER_SIZE == 'small' or os.environ.get('FLOWER_ENABLED', '1') == '0':
return [cls.gunicorn]
else:
return [cls.gunicorn, cls.flower]
@classmethod
def celery_services(cls):
if SERVER_SIZE == 'small' or os.environ.get('CELERY_COMBINE', '0') == '1':
return [cls.celery_default]
if SERVER_SIZE == 'small' or os.environ.get('CELERY_COMBINE_QUEUES', '0') == '1':
return [cls.celery_combine]
else:
return [cls.celery_ansible, cls.celery_default]
@@ -122,18 +124,13 @@ class BaseActionCommand(BaseCommand):
def get_services_kwargs(self, options):
worker = options.get('worker', 4)
default_queue = 'celery'
if SERVER_SIZE == 'small':
worker = 1
default_queue = 'celery,ansible'
return {
'gunicorn': {
'worker': worker
},
'celery_default': {
'queue': default_queue
}
}

1
apps/common/management/commands/services/services/__init__.py
View File

@@ -1,5 +1,6 @@
from .beat import *
from .celery_ansible import *
from .celery_default import *
from .celery_combine import *
from .flower import *
from .gunicorn import *

11
apps/common/management/commands/services/services/celery_combine.py Normal file
View File

@@ -0,0 +1,11 @@
from .celery_base import CeleryBaseService
__all__ = ['CeleryCombineService']
class CeleryCombineService(CeleryBaseService):
def __init__(self, **kwargs):
kwargs['queue'] = 'ansible,celery'
super().__init__(**kwargs)