diff --git a/HttpServer/Events/OnManagerStart.php b/HttpServer/Events/OnManagerStart.php index 3d0a2a43..69c6d2a2 100644 --- a/HttpServer/Events/OnManagerStart.php +++ b/HttpServer/Events/OnManagerStart.php @@ -20,18 +20,18 @@ class OnManagerStart extends Callback { - /** - * @param Server $server - * @throws Exception - */ - public function onHandler(Server $server) - { - Snowflake::setWorkerId($server->manager_pid); + /** + * @param Server $server + * @throws Exception + */ + public function onHandler(Server $server) + { + Snowflake::setWorkerId($server->manager_pid); - fire(Event::SERVER_MANAGER_START, [$server]); + fire(Event::SERVER_MANAGER_START, [$server]); - name($server->manager_pid); - } + name($server->manager_pid, 'manager'); + } } diff --git a/HttpServer/Events/OnStart.php b/HttpServer/Events/OnStart.php index 39bb1d29..820a673e 100644 --- a/HttpServer/Events/OnStart.php +++ b/HttpServer/Events/OnStart.php @@ -24,9 +24,8 @@ class OnStart extends Callback */ public function onHandler(Server $server) { -// Snowflake::setProcessId($server->master_pid); if (Snowflake::getPlatform()->isLinux()) { - name($server->master_pid); + name($server->master_pid, 'master'); } fire(Event::SERVER_EVENT_START, [$server]); } diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index a384a39a..0c84ed6f 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -35,7 +35,7 @@ class OnWorkerStart extends Callback putenv('state=start'); putenv('worker=' . $worker_id); - name($server->worker_pid); + name($server->worker_pid, Snowflake::isTask() ? 'task' : 'worker'); if ($worker_id >= $server->setting['worker_num']) { $this->onTask($server, $worker_id); @@ -54,9 +54,9 @@ class OnWorkerStart extends Callback { putenv('environmental=' . Snowflake::TASK); - Snowflake::setTaskId($server->worker_pid); + Snowflake::setTaskId($server->worker_pid); - fire(Event::SERVER_TASK_START); + fire(Event::SERVER_TASK_START); } diff --git a/System/Process/Process.php b/System/Process/Process.php index cf29d76a..3499fcb1 100644 --- a/System/Process/Process.php +++ b/System/Process/Process.php @@ -47,7 +47,7 @@ abstract class Process extends \Swoole\Process implements SProcess fire(Event::SERVER_WORKER_START); if (Snowflake::getPlatform()->isLinux()) { - $this->name($this->getPrefix()); + name($process->pid, $this->getPrefix()); } $this->onHandler($process); } @@ -58,7 +58,7 @@ abstract class Process extends \Swoole\Process implements SProcess */ #[Pure] private function getPrefix(): string { - return Snowflake::app()->id . ' ' . get_called_class(); + return get_called_class(); }