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

qqq

Browse Source
This commit is contained in:
xl
2023-07-10 10:24:01 +08:00
parent 611ae77bed
commit 00cbeb819c
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HotReload.php
+26 -23
View File
@@ -9,9 +9,6 @@ use Kiri\Server\Abstracts\BaseProcess;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Event; use Swoole\Event;
use Swoole\Process; use Swoole\Process;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class HotReload extends BaseProcess class HotReload extends BaseProcess
{ {
@@ -30,6 +27,9 @@ class HotReload extends BaseProcess
private array $dirs = [APP_PATH . 'app', APP_PATH . 'routes']; private array $dirs = [APP_PATH . 'app', APP_PATH . 'routes'];
protected mixed $inotify;
/** /**
* @return string * @return string
*/ */
@@ -48,7 +48,12 @@ class HotReload extends BaseProcess
if (Context::inCoroutine()) { if (Context::inCoroutine()) {
Coroutine::create(fn() => $this->onShutdown(Coroutine::waitSignal(SIGTERM | SIGINT))); Coroutine::create(fn() => $this->onShutdown(Coroutine::waitSignal(SIGTERM | SIGINT)));
} else { } else {
Process::signal(SIGTERM | SIGINT, fn($data) => $this->onShutdown($data)); Process::signal(SIGTERM | SIGINT, function ($data) {
foreach ($this->watchFiles as $file) {
@inotify_rm_watch($file, $this->inotify);
}
$this->onShutdown($data);
});
} }
return $this; return $this;
} }
@@ -87,19 +92,18 @@ class HotReload extends BaseProcess
*/ */
private function onInotifyReload(): void private function onInotifyReload(): void
{ {
$init = inotify_init(); $this->inotify = inotify_init();
foreach ($this->dirs as $dir) { foreach ($this->dirs as $dir) {
if (!is_dir($dir)) { if (!is_dir($dir)) {
continue; continue;
} }
$this->watch($init, rtrim($dir, '/')); $this->watch(rtrim($dir, '/'));
} }
Event::add($init, fn() => $this->check($init)); Event::add($this->inotify, fn() => $this->check());
Event::cycle(function () use ($init) { Event::cycle(function () {
$pid = (int)file_get_contents(storage('.swoole.pid')); $pid = (int)file_get_contents(storage('.swoole.pid'));
var_dump($this->isStop());
if ($pid <= 0 || !Process::kill($pid, 0) || $this->isStop()) { if ($pid <= 0 || !Process::kill($pid, 0) || $this->isStop()) {
Event::del($init); Event::del($this->inotify);
} }
}, true); }, true);
Event::wait(); Event::wait();
@@ -202,9 +206,9 @@ class HotReload extends BaseProcess
/** /**
* 开始监听 * 开始监听
*/ */
public function check($inotify): void public function check(): void
{ {
if (!($events = inotify_read($inotify))) { if (!($events = inotify_read($this->inotify))) {
return; return;
} }
if (Context::exists('isReloading')) { if (Context::exists('isReloading')) {
@@ -230,7 +234,7 @@ class HotReload extends BaseProcess
if (Context::exists('swoole_timer_after')) { if (Context::exists('swoole_timer_after')) {
return; return;
} }
$int = @swoole_timer_after(2000, fn() => $this->reload($inotify)); $int = @swoole_timer_after(2000, fn() => $this->reload());
Context::set('swoole_timer_after', $int); Context::set('swoole_timer_after', $int);
Context::set('isReloading', true); Context::set('isReloading', true);
} }
@@ -239,13 +243,13 @@ class HotReload extends BaseProcess
/** /**
* @throws Exception * @throws Exception
*/ */
public function reload($inotify): void public function reload(): void
{ {
$this->trigger_reload(); $this->trigger_reload();
$this->clearWatch($inotify); $this->clearWatch();
foreach ($this->dirs as $root) { foreach ($this->dirs as $root) {
$this->watch($inotify, $root); $this->watch($root);
} }
Context::remove('swoole_timer_after'); Context::remove('swoole_timer_after');
Context::remove('isReloading'); Context::remove('isReloading');
@@ -284,11 +288,11 @@ class HotReload extends BaseProcess
/** /**
* @throws Exception * @throws Exception
*/ */
public function clearWatch($inotify): void public function clearWatch(): void
{ {
foreach ($this->watchFiles as $wd) { foreach ($this->watchFiles as $wd) {
try { try {
inotify_rm_watch($inotify, $wd); inotify_rm_watch($this->inotify, $wd);
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
logger()->addError($exception, 'throwable'); logger()->addError($exception, 'throwable');
} }
@@ -298,12 +302,11 @@ class HotReload extends BaseProcess
/** /**
* @param $inotify
* @param $dir * @param $dir
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public function watch($inotify, $dir): bool public function watch($dir): bool
{ {
//目录不存在 //目录不存在
if (!is_dir($dir)) { if (!is_dir($dir)) {
@@ -318,7 +321,7 @@ class HotReload extends BaseProcess
return FALSE; return FALSE;
} }
$wd = @inotify_add_watch($inotify, $dir, IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE); $wd = @inotify_add_watch($this->inotify, $dir, IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE);
$this->watchFiles[$dir] = $wd; $this->watchFiles[$dir] = $wd;
$files = scandir($dir); $files = scandir($dir);
@@ -329,13 +332,13 @@ class HotReload extends BaseProcess
$path = $dir . '/' . $f; $path = $dir . '/' . $f;
//递归目录 //递归目录
if (is_dir($path)) { if (is_dir($path)) {
$this->watch($inotify, $path); $this->watch($path);
continue; continue;
} }
//检测文件类型 //检测文件类型
if (strstr($f, '.') == '.php') { if (strstr($f, '.') == '.php') {
$wd = @inotify_add_watch($inotify, $path, IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE); $wd = @inotify_add_watch($this->inotify, $path, IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE);
$this->watchFiles[$path] = $wd; $this->watchFiles[$path] = $wd;
} }
} }