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 10:58:34 +08:00
parent 2c0a431069
commit 49ac53e751
1 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/FileListen/FileChangeCustomProcess.php
+51 -31
View File
@@ -8,13 +8,10 @@ use Kiri\Abstracts\Logger;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Coroutine\Barrier;
use Swoole\Process; use Swoole\Process;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use function Co\run;
/** /**
@@ -35,7 +32,7 @@ class FileChangeCustomProcess extends Command
protected mixed $source = null; protected mixed $source = null;
protected mixed $pipes = []; protected mixed $pipes = [];
protected ?Coroutine\Channel $channel = null; protected ?Coroutine\Channel $channel = null;
/** /**
@@ -45,7 +42,7 @@ class FileChangeCustomProcess extends Command
{ {
$this->setName('sw:wather') $this->setName('sw:wather')
->setDescription('server start'); ->setDescription('server start');
} }
/** /**
@@ -67,11 +64,38 @@ class FileChangeCustomProcess extends Command
$driver = Kiri::getDi()->get(Inotify::class, [$this->dirs, $this]); $driver = Kiri::getDi()->get(Inotify::class, [$this->dirs, $this]);
} }
$this->trigger_reload(); $this->trigger_reload();
Coroutine::create(function () use ($driver) { Coroutine::create(function () use ($driver) {
$driver->start(); Coroutine::create(function () {
}); $waite = Coroutine::waitSignal(SIGTERM | SIGKILL);
return 0; if ($waite) {
$this->stop();
}
});
$driver->start();
});
return 0;
}
/**
* @throws Exception
*/
private function stop(): void
{
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);
$this->source = null;
}
} }
/** /**
@@ -92,35 +116,31 @@ class FileChangeCustomProcess extends Command
/** /**
* 重启 * 重启
* *
* @throws Exception * @throws Exception
*/ */
public function trigger_reload() public function trigger_reload()
{ {
Kiri::getDi()->get(Logger::class)->warning('change reload'); Kiri::getDi()->get(Logger::class)->warning('change reload');
if (file_exists(storage('.swoole.pid'))) { if (file_exists(storage('.swoole.pid'))) {
$content = (int)file_get_contents(storage('.swoole.pid')); $content = (int)file_get_contents(storage('.swoole.pid'));
if ($content > 0 && Process::kill($content,0)){ if ($content > 0 && Process::kill($content, 0)) {
Process::kill($content,15); Process::kill($content, 15);
} }
@unlink(storage('.swoole.pid')); @unlink(storage('.swoole.pid'));
if (is_resource($this->source)) { if (is_resource($this->source)) {
proc_close($this->source); proc_close($this->source);
$this->source = null; $this->source = null;
} }
} }
Coroutine::create(function () { Coroutine::create(function () {
$descriptorspec = [0 => STDIN, 1 => STDOUT, 2 => STDERR]; $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", $descriptorspec, $pipes);
}); });
} }
} }