From 12b59eaaa3b859ca2e493c985b0b47237ef6a460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Thu, 16 Jun 2022 19:00:48 +0800 Subject: [PATCH] modify plugin name --- Server.php | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/Server.php b/Server.php index 1589e26..6a1b48d 100644 --- a/Server.php +++ b/Server.php @@ -153,12 +153,12 @@ class Server extends HttpService * @param OnWorkerStart $onWorkerStart * @throws ConfigException */ - protected function setWorkerName(OnWorkerStart $onWorkerStart): void + public function setWorkerName(OnWorkerStart $onWorkerStart): void { $prefix = sprintf('Worker Process[%d].%d', $onWorkerStart->server->worker_pid, $onWorkerStart->workerId); set_env('environmental', Kiri::WORKER); - $this->setProcessName($prefix); + Kiri::setProcessName($prefix); } @@ -166,35 +166,20 @@ class Server extends HttpService * @param OnWorkerStart $onWorkerStart * @throws ConfigException */ - protected function setTaskerName(OnWorkerStart $onWorkerStart): void + public function setTaskerName(OnWorkerStart $onWorkerStart): void { $prefix = sprintf('Worker Process[%d].%d', $onWorkerStart->server->worker_pid, $onWorkerStart->workerId); set_env('environmental', Kiri::WORKER); - $this->setProcessName($prefix); + Kiri::setProcessName($prefix); } - /** - * @param $prefix - * @throws ConfigException - */ - protected function setProcessName($prefix): void - { - if (Kiri::getPlatform()->isMac()) { - return; - } - $name = '[' . Config::get('id', 'system-service') . ']'; - if (!empty($prefix)) { - $name .= '.' . $prefix; - } - swoole_set_process_name($name); - } - /** * @return void * @throws ConfigException * @throws ReflectionException + * @throws Exception */ public function onHotReload(): void {