From 0b439c4f1d7e6259d52fa1900bd1553701ee4cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Mon, 7 Sep 2020 16:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Events/OnStart.php | 7 ++++++- HttpServer/Events/OnWorkerStart.php | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HttpServer/Events/OnStart.php b/HttpServer/Events/OnStart.php index e5fad17a..ff6e6a9b 100644 --- a/HttpServer/Events/OnStart.php +++ b/HttpServer/Events/OnStart.php @@ -5,6 +5,7 @@ namespace HttpServer\Events; use HttpServer\Abstracts\Callback; +use Snowflake\Abstracts\Config; use Snowflake\Event; use Snowflake\Snowflake; use Swoole\Server; @@ -19,11 +20,15 @@ class OnStart extends Callback public function onHandler($server) { Snowflake::setProcessId($server->master_pid); - + $event = Snowflake::app()->event; if ($event->exists(Event::SERVER_EVENT_START)) { $event->trigger(Event::SERVER_EVENT_START, null, $server); } + + if (Snowflake::isLinux()) { + name(rtrim(Config::get('id', 'system:'), ':')); + } } } diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index df54a916..b82d5899 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -9,8 +9,10 @@ use HttpServer\Abstracts\Callback; use HttpServer\Route\Annotation\Websocket as AWebsocket; use HttpServer\Service\Http; use HttpServer\Service\Websocket; +use Snowflake\Abstracts\Config; use Snowflake\Error\Logger; use Snowflake\Event; +use Snowflake\Exception\ConfigException; use Snowflake\Snowflake; use Swoole\Server; @@ -66,10 +68,11 @@ class OnWorkerStart extends Callback * @param $socket * @param $worker_id * @return string + * @throws ConfigException */ private function get_process_name($socket, $worker_id) { - $prefix = 'system:'; + $prefix = rtrim(Config::get('id', 'system:'), ':'); if ($worker_id >= $socket->setting['worker_num']) { return $prefix . ': Task: No.' . $worker_id; } else {