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:
向林
2021-11-05 14:22:57 +08:00
parent e7e24a1488
commit c878ed0ba4
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/FileListen/FileChangeCustomProcess.php
+13 -26
View File
@@ -73,6 +73,7 @@ class FileChangeCustomProcess extends Command
Coroutine::create(function () use ($driver) {
$waite = Coroutine::waitSignal(SIGTERM | SIGKILL);
if ($waite) {
$driver->clear();
$this->stop($driver);
}
});
@@ -85,20 +86,19 @@ class FileChangeCustomProcess extends Command
/**
* @throws Exception
*/
private function stop($driver): void
private function stop(): void
{
$driver->clear();
if (!file_exists(storage('.swoole.pid'))) {
return;
}
$content = (int)file_get_contents(storage('.swoole.pid'));
if ($content > 0 && Process::kill($content, 0)) {
Process::kill($content, 15);
}
@unlink(storage('.swoole.pid'));
// if (!file_exists(storage('.swoole.pid'))) {
// return;
// }
// $content = (int)file_get_contents(storage('.swoole.pid'));
// if ($content > 0 && Process::kill($content, 0)) {
// Process::kill($content, 15);
// }
// @unlink(storage('.swoole.pid'));
if (is_resource($this->source)) {
proc_close($this->source);
proc_terminate($this->source);
$this->source = null;
}
}
@@ -128,22 +128,9 @@ class FileChangeCustomProcess extends Command
{
Kiri::getDi()->get(Logger::class)->warning('change reload');
if (file_exists(storage('.swoole.pid'))) {
$content = (int)file_get_contents(storage('.swoole.pid'));
if ($content > 0 && Process::kill($content, 0)) {
Process::kill($content, 15);
}
@unlink(storage('.swoole.pid'));
if (is_resource($this->source)) {
proc_close($this->source);
$this->source = null;
}
}
$this->stop();
Coroutine::create(function () {
$descriptorspec = [0 => STDIN, 1 => STDOUT, 2 => STDERR];
$this->source = proc_open("php " . APP_PATH . "kiri.php", $descriptorspec, $pipes);
$this->source = proc_open("php " . APP_PATH . "kiri.php", [], $pipes);
});
}