Merge pull request #11018 from jumpserver/pr@dev@perf_coreworker

perf: 优化 Core Worker 数量

apps/common/management/commands/services/command.py

@@ -94,15 +94,11 @@ class BaseActionCommand(BaseCommand):
         super().__init__(*args, **kwargs)
 
     def add_arguments(self, parser):
-        cores = 10
-        if (multiprocessing.cpu_count() * 2 + 1) < cores:
-            cores = multiprocessing.cpu_count() * 2 + 1
-
         parser.add_argument(
             'services', nargs='+', choices=Services.export_services_values(), help='Service',
         )
         parser.add_argument('-d', '--daemon', nargs="?", const=True)
-        parser.add_argument('-w', '--worker', type=int, nargs="?", default=cores)
+        parser.add_argument('-w', '--worker', type=int, nargs="?", default=4)
         parser.add_argument('-f', '--force', nargs="?", const=True)
 
     def initial_util(self, *args, **options):

jms

@@ -152,10 +152,14 @@ def start_services():
     start_args = []
     if args.daemon:
         start_args.append('--daemon')
-    if args.worker:
-        start_args.extend(['--worker', str(args.worker)])
     if args.force:
         start_args.append('--force')
+    if args.worker:
+        start_args.extend(['--worker', str(args.worker)])
+    else:
+        worker = os.environ.get('CORE_WORKER')
+        if isinstance(worker, str) and worker.isdigit():
+            start_args.extend(['--worker', worker])
 
     try:
         management.call_command(action, *services, *start_args)