This commit is contained in:
2020-10-21 16:14:07 +08:00
parent 2d4d211b69
commit 98820bd995
3 changed files with 16 additions and 19 deletions
-7
View File
@@ -28,13 +28,6 @@ class OnManagerStart extends Callback
if (Snowflake::isLinux()) { if (Snowflake::isLinux()) {
name('Server Manager.'); name('Server Manager.');
} }
pcntl_signal(9 | 15, function () use ($server) {
while (pcntl_wifexited(0)) {
var_dump(error_get_last());
break;
}
});
} }
} }
+16 -7
View File
@@ -30,16 +30,25 @@ class OnStart extends Callback
name(rtrim(Config::get('id', 'system:'), ':')); name(rtrim(Config::get('id', 'system:'), ':'));
} }
Process::signal(9, function () use ($server) { pcntl_signal(9 | 15, function () use ($server) {
while ($ret = Process::wait()) { $status = 0;
if ($ret['signal'] == 9 || $ret['signal'] == 15) { while (pcntl_waitpid($server->master_pid,$status)) {
$server->shutdown(); var_dump('skill');
} else { var_dump(error_get_last());
$server->reload(); break;
}
} }
}); });
// Process::signal(9, function () use ($server) {
// while ($ret = Process::wait()) {
// if ($ret['signal'] == 9 || $ret['signal'] == 15) {
// $server->shutdown();
// } else {
// $server->reload();
// }
// }
// });
} }
} }
-5
View File
@@ -41,11 +41,6 @@ class OnWorkerStart extends Callback
if ($worker_id >= $server->setting['worker_num']) { if ($worker_id >= $server->setting['worker_num']) {
return; return;
} }
go(function () use ($server) {
while ($ret = System::waitPid($server->master_pid)) {
var_dump($ret);
}
});
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
$this->setWorkerAction($worker_id); $this->setWorkerAction($worker_id);
} }