github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-05 01:11:57 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复启动脚本beat进程偶尔不会结束的问题

Browse Source
This commit is contained in:
Bai
2021-08-12 15:27:18 +08:00
committed by Jiangjie.Bai
parent cd6c7ce7fa
commit 33236aaa47
5 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ class Services(TextChoices):
@classmethod
def task_services(cls):
return cls.celery_services() + [cls.beat]
return cls.celery_services() + [cls.beat, cls.flower]
@classmethod
def all_services(cls):
@@ -113,9 +113,9 @@ class BaseActionCommand(BaseCommand):
kwargs = {
'services': services,
'daemon_run': options.get('daemon', False),
'daemon_stop': Services.all.value in service_names,
'force_stop': options.get('force', False),
'run_daemon': options.get('daemon', False),
'stop_daemon': self.action == Action.stop.value and Services.all.value in service_names,
'force_stop': options.get('force') or False,
}
self.util = ServicesUtil(**kwargs)