as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-29 11:41:46 +08:00
parent 118ac9efe5
commit 98778b69fb
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnManagerStart.php
+10 -10
View File
@@ -20,18 +20,18 @@ class OnManagerStart extends Callback
{ {
/** /**
* @param Server $server * @param Server $server
* @throws Exception * @throws Exception
*/ */
public function onHandler(Server $server) public function onHandler(Server $server)
{ {
Snowflake::setWorkerId($server->manager_pid); 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');
} }
} }
HttpServer/Events/OnStart.php
+1 -2
View File
@@ -24,9 +24,8 @@ class OnStart extends Callback
*/ */
public function onHandler(Server $server) public function onHandler(Server $server)
{ {
// Snowflake::setProcessId($server->master_pid);
if (Snowflake::getPlatform()->isLinux()) { if (Snowflake::getPlatform()->isLinux()) {
name($server->master_pid); name($server->master_pid, 'master');
} }
fire(Event::SERVER_EVENT_START, [$server]); fire(Event::SERVER_EVENT_START, [$server]);
} }
HttpServer/Events/OnWorkerStart.php
+3 -3
View File
@@ -35,7 +35,7 @@ class OnWorkerStart extends Callback
putenv('state=start'); putenv('state=start');
putenv('worker=' . $worker_id); putenv('worker=' . $worker_id);
name($server->worker_pid); name($server->worker_pid, Snowflake::isTask() ? 'task' : 'worker');
if ($worker_id >= $server->setting['worker_num']) { if ($worker_id >= $server->setting['worker_num']) {
$this->onTask($server, $worker_id); $this->onTask($server, $worker_id);
@@ -54,9 +54,9 @@ class OnWorkerStart extends Callback
{ {
putenv('environmental=' . Snowflake::TASK); putenv('environmental=' . Snowflake::TASK);
Snowflake::setTaskId($server->worker_pid); Snowflake::setTaskId($server->worker_pid);
fire(Event::SERVER_TASK_START); fire(Event::SERVER_TASK_START);
} }
System/Process/Process.php
+2 -2
View File
@@ -47,7 +47,7 @@ abstract class Process extends \Swoole\Process implements SProcess
fire(Event::SERVER_WORKER_START); fire(Event::SERVER_WORKER_START);
if (Snowflake::getPlatform()->isLinux()) { if (Snowflake::getPlatform()->isLinux()) {
$this->name($this->getPrefix()); name($process->pid, $this->getPrefix());
} }
$this->onHandler($process); $this->onHandler($process);
} }
@@ -58,7 +58,7 @@ abstract class Process extends \Swoole\Process implements SProcess
*/ */
#[Pure] private function getPrefix(): string #[Pure] private function getPrefix(): string
{ {
return Snowflake::app()->id . ' ' . get_called_class(); return get_called_class();
} }