Compare commits

...

2 Commits

Author SHA1 Message Date
as2252258 908c8719d3 eee 2026-06-24 20:17:54 +08:00
as2252258 69b845d924 eee 2026-06-12 23:57:18 +08:00
3 changed files with 20 additions and 19 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
try { try {
$this->dispatch->dispatch(new OnBeforeWorkerStart($server, $workerId)); $this->dispatch->dispatch(new OnBeforeWorkerStart($server, $workerId));
if ($workerId < $server->setting['worker_num']) { if ($workerId < $server->setting['worker_num']) {
CoordinatorManager::utility(Coordinator::WORKER_START)->waite(); CoordinatorManager::utility(Coordinator::WORKER_START)->wait();
$this->dispatch->dispatch(new OnWorkerStart($server, $workerId)); $this->dispatch->dispatch(new OnWorkerStart($server, $workerId));
} else { } else {
+18 -17
View File
@@ -125,22 +125,23 @@ class ServerCommand extends Command
} }
/** /**
* @param InputInterface $input * @param InputInterface $input
* @return int * @return int
* @throws * @throws
*/ */
protected function start(InputInterface $input): int protected function start(InputInterface $input): int
{ {
$this->asyncServer->addProcess(config('process', [])); $this->asyncServer->addProcess(config('process', []));
if (\config('servers.reload.hot', false) === true) { if (\config('servers.reload.hot', false) === true) {
$this->asyncServer->addProcess([FileWatcher::class]); $this->asyncServer->addProcess([FileWatcher::class]);
} else { }
di(Router::class)->scan_build_route(); // Master 进程在 fork 前完成首次扫描,Worker 启动时不再重复全量扫描
} // 避免每个 Worker 独立执行 opcache_compile_file + invalidateClasses 造成 OOM
$this->asyncServer->initCoreServers(config('servers.server', []), (int)$input->getOption('daemon')); di(Router::class)->scan_build_route();
$this->asyncServer->start(); $this->asyncServer->initCoreServers(config('servers.server', []), (int)$input->getOption('daemon'));
return 1; $this->asyncServer->start();
} return 1;
}
} }
+1 -1
View File
@@ -9,7 +9,7 @@
} }
], ],
"require": { "require": {
"php": ">=8.4", "php": ">=8.5",
"ext-json": "*", "ext-json": "*",
"composer-runtime-api": "^2.0", "composer-runtime-api": "^2.0",
"psr/http-server-middleware": "^1.0", "psr/http-server-middleware": "^1.0",