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-02-26 19:07:28 +08:00
parent e0a51e783a
commit 1e7c701b14
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnWorkerStart.php
+2 -3
View File
@@ -37,12 +37,12 @@ class OnWorkerStart extends Callback
if (!empty($get_name) && !Snowflake::isMac()) { if (!empty($get_name) && !Snowflake::isMac()) {
swoole_set_process_name($get_name); swoole_set_process_name($get_name);
} }
$this->onTaskSignal($server, $worker_id);
putenv('workerId=' . ($worker_id >= $server->setting['worker_num'] ? 'Task' : 'Worker') . '.' . $worker_id); putenv('workerId=' . ($worker_id >= $server->setting['worker_num'] ? 'Task' : 'Worker') . '.' . $worker_id);
if ($worker_id >= $server->setting['worker_num']) { if ($worker_id >= $server->setting['worker_num']) {
fire(Event::SERVER_TASK_START); fire(Event::SERVER_TASK_START);
$this->onTaskSignal($server, $worker_id);
} else { } else {
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
$this->setWorkerAction($worker_id); $this->setWorkerAction($worker_id);
@@ -57,9 +57,8 @@ class OnWorkerStart extends Callback
*/ */
public function onTaskSignal(Server $server, int $workerId) public function onTaskSignal(Server $server, int $workerId)
{ {
Coroutine::getContext()['isComplete'] = false;
go(function () use ($server, $workerId) { go(function () use ($server, $workerId) {
$sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2, -1); $sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2 | SIGUSR1, -1);
if ($sigkill === false) { if ($sigkill === false) {
return $server->stop($workerId); return $server->stop($workerId);
} }