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:58:29 +08:00
parent 4065d2c4dc
commit 053ae40916
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnWorkerStart.php
+4 -7
View File
@@ -41,8 +41,6 @@ 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);
@@ -50,6 +48,7 @@ class OnWorkerStart extends Callback
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
$this->setWorkerAction($worker_id); $this->setWorkerAction($worker_id);
} }
$this->onTaskSignal($server, $worker_id);
} }
@@ -57,20 +56,18 @@ class OnWorkerStart extends Callback
* @param Server $server * @param Server $server
* @param int $workerId * @param int $workerId
* 异步任务管制 * 异步任务管制
* @return mixed
*/ */
public function onTaskSignal(Server $server, int $workerId) public function onTaskSignal(Server $server, int $workerId): mixed
{ {
go(function () use ($server, $workerId) {
$sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2 | SIGUSR1, -1); $sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2 | SIGUSR1, -1);
if ($sigkill === false) { if ($sigkill === false) {
return $server->stop($workerId); return $server->stop($workerId);
} }
var_dump(Snowflake::app()->isRun()); while ($server->stats()['coroutine_num'] > 0) {
while (Snowflake::app()->isRun()) {
Coroutine::sleep(0.01); Coroutine::sleep(0.01);
} }
return $server->stop($workerId); return $server->stop($workerId);
});
} }