diff --git a/Server/Abstracts/Server.php b/Server/Abstracts/Server.php index eed98bbe..f27d549e 100644 --- a/Server/Abstracts/Server.php +++ b/Server/Abstracts/Server.php @@ -6,7 +6,9 @@ namespace Server\Abstracts; use Closure; use Exception; +use Snowflake\Abstracts\Config; use Snowflake\Event; +use Snowflake\Exception\ConfigException; use Snowflake\Snowflake; @@ -24,6 +26,25 @@ abstract class Server protected Event $_event; + + + /** + * @param $prefix + * @throws ConfigException + */ + protected function setProcessName($prefix) + { + if (Snowflake::getPlatform()->isMac()) { + return; + } + $name = Config::get('id', 'system-service'); + if (!empty($prefix)) { + $name .= '.' . $prefix; + } + swoole_set_process_name($name); + } + + /** * Server constructor. * @throws Exception diff --git a/Server/Manager/ServerDefaultEvent.php b/Server/Manager/ServerDefaultEvent.php index 9bab51f4..c3050462 100644 --- a/Server/Manager/ServerDefaultEvent.php +++ b/Server/Manager/ServerDefaultEvent.php @@ -22,7 +22,9 @@ class ServerDefaultEvent extends Server */ public function onStart(\Swoole\Server $server) { - $this->runEvent(Constant::START, null, [$server]); + $this->setProcessName(sprintf('start[%d].server', $server->worker_pid)); + + $this->runEvent(Constant::START, null, [$server]); } diff --git a/Server/Manager/ServerManager.php b/Server/Manager/ServerManager.php index 41467733..518f9ccb 100644 --- a/Server/Manager/ServerManager.php +++ b/Server/Manager/ServerManager.php @@ -19,7 +19,9 @@ class ServerManager extends Server */ public function onManagerStart(\Swoole\Server $server) { - $this->runEvent(Constant::MANAGER_START, null, [$server]); + $this->setProcessName(sprintf('manger[%d].0', $server->worker_pid)); + + $this->runEvent(Constant::MANAGER_START, null, [$server]); } diff --git a/Server/Worker/ServerWorker.php b/Server/Worker/ServerWorker.php index 5f2fe614..bb6135e2 100644 --- a/Server/Worker/ServerWorker.php +++ b/Server/Worker/ServerWorker.php @@ -68,22 +68,6 @@ class ServerWorker extends \Server\Abstracts\Server } - /** - * @param $prefix - * @throws ConfigException - */ - private function setProcessName($prefix) - { - if (Snowflake::getPlatform()->isMac()) { - return; - } - $name = Config::get('id', 'system-service'); - if (!empty($prefix)) { - $name .= '.' . $prefix; - } - swoole_set_process_name($name); - } - /** * @param $worker_id