This commit is contained in:
2023-08-11 02:32:04 +08:00
parent db7e16c35c
commit 3196a7cffb
2 changed files with 95 additions and 122 deletions
-45
View File
@@ -8,13 +8,9 @@ use Kiri;
use Kiri\Events\EventDispatch;
use Kiri\Router\Router;
use Kiri\Server\Events\OnShutdown;
use Kiri\Server\Events\OnTaskerStart;
use Kiri\Server\Events\OnWorkerStart;
use Kiri\Server\Events\OnWorkerStop;
use Kiri\Server\Abstracts\AsyncServer;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Swoole\Timer;
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
@@ -48,23 +44,12 @@ class Server
}
/**
* @return void
*/
public function init(): void
{
on(OnWorkerStart::class, [$this, 'onWorkerName']);
on(OnTaskerStart::class, [$this, 'onTaskerName']);
}
/**
* @return void
* @throws Exception
*/
public function start(): void
{
on(OnWorkerStop::class, [Timer::class, 'clearAll'], 9999);
if (\config('reload.hot', false) === true) {
$this->manager->addProcess(HotReload::class);
} else {
@@ -75,36 +60,6 @@ class Server
}
/**
* @param OnWorkerStart $onWorkerStart
*/
public function onWorkerName(OnWorkerStart $onWorkerStart): void
{
if (!property_exists($onWorkerStart->server, 'worker_pid')) {
return;
}
$prefix = sprintf('Worker Process[%d].%d', $onWorkerStart->server->worker_pid, $onWorkerStart->workerId);
set_env('environmental', Kiri::WORKER);
Kiri::setProcessName($prefix);
}
/**
* @param OnTaskerStart $onWorkerStart
*/
public function onTaskerName(OnTaskerStart $onWorkerStart): void
{
if (!property_exists($onWorkerStart->server, 'worker_pid')) {
return;
}
$prefix = sprintf('Tasker Process[%d].%d', $onWorkerStart->server->worker_pid, $onWorkerStart->workerId);
set_env('environmental', Kiri::TASK);
Kiri::setProcessName($prefix);
}
/**
* @return void
* @throws ContainerExceptionInterface