Revert "改名"
This reverts commit fdf58326
This commit is contained in:
@@ -35,6 +35,18 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
|
|||||||
public EventDispatch $eventDispatch;
|
public EventDispatch $eventDispatch;
|
||||||
|
|
||||||
|
|
||||||
|
public Router $collector;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function init()
|
||||||
|
{
|
||||||
|
$this->collector = Kiri::getDi()->get(Router::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Server $server
|
* @param Server $server
|
||||||
* @param int $workerId
|
* @param int $workerId
|
||||||
@@ -46,6 +58,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
|
|||||||
set_env('environmental_workerId', $workerId);
|
set_env('environmental_workerId', $workerId);
|
||||||
if ($workerId < $server->setting['worker_num']) {
|
if ($workerId < $server->setting['worker_num']) {
|
||||||
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
|
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
|
||||||
|
$this->collector->scan_build_route();
|
||||||
$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
|
$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
|
||||||
set_env('environmental', Kiri::WORKER);
|
set_env('environmental', Kiri::WORKER);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -99,8 +99,6 @@ class Server extends HttpService
|
|||||||
|
|
||||||
$this->eventDispatch->dispatch(new OnServerBeforeStart());
|
$this->eventDispatch->dispatch(new OnServerBeforeStart());
|
||||||
|
|
||||||
Kiri::getDi()->get(Router::class)->scan_build_route();
|
|
||||||
|
|
||||||
return $this->manager->getServer()->start();
|
return $this->manager->getServer()->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user