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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-02-27 04:10:52 +08:00
parent 2e417cb2bb
commit caa3672a86
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnWorkerStart.php
+6 -8
View File
@@ -37,13 +37,6 @@ class OnWorkerStart extends Callback
public function onHandler(Server $server, int $worker_id): void public function onHandler(Server $server, int $worker_id): void
{ {
Coroutine::set(['enable_deadlock_check' => false]); Coroutine::set(['enable_deadlock_check' => false]);
Coroutine\go(function () use ($server, $worker_id) {
$this->onTaskSignal($server, $worker_id);
});
Coroutine\go(function () use ($server) {
var_dump(Coroutine::waitPid($server->worker_pid));
});
$get_name = $this->get_process_name($server, $worker_id); $get_name = $this->get_process_name($server, $worker_id);
if (!empty($get_name) && !Snowflake::isMac()) { if (!empty($get_name) && !Snowflake::isMac()) {
swoole_set_process_name($get_name); swoole_set_process_name($get_name);
@@ -52,6 +45,12 @@ class OnWorkerStart extends Callback
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);
Coroutine\go(function () use ($server, $worker_id) {
$this->onTaskSignal($server, $worker_id);
});
Coroutine\go(function () use ($server) {
Coroutine::waitPid($server->worker_pid);
});
} else { } else {
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
$this->setWorkerAction($worker_id); $this->setWorkerAction($worker_id);
@@ -70,7 +69,6 @@ class OnWorkerStart extends Callback
{ {
try { try {
$sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2 | SIGUSR1); $sigkill = Coroutine::waitSignal(SIGTERM | SIGKILL | SIGUSR2 | SIGUSR1);
var_dump($sigkill, __LINE__);
if ($sigkill !== false) { if ($sigkill !== false) {
do { do {
if (!Snowflake::app()->isRun()) { if (!Snowflake::app()->isRun()) {