This commit is contained in:
2021-11-19 03:36:35 +08:00
parent f6552c45ae
commit ea09d3e3ba
+6 -12
View File
@@ -83,7 +83,6 @@ class HotReload extends Command
} }
/** /**
* @throws Exception * @throws Exception
*/ */
@@ -149,7 +148,6 @@ class HotReload extends Command
} }
/** /**
* 重启 * 重启
* *
@@ -158,18 +156,14 @@ class HotReload extends Command
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 ($this->process instanceof Process && Process::kill($this->process->pid, 0)) { $pid = file_get_contents(storage('.swoole.pid'));
$pid = file_get_contents(storage('.swoole.pid')); if (!empty($pid) && Process::kill($pid, 0)) {
if (!empty($pid) && Process::kill($pid, 0)) { Process::kill($pid, SIGTERM);
Process::kill($pid, SIGTERM);
}
Process::kill($this->process->pid, SIGTERM);
Process::wait(TRUE); Process::wait(TRUE);
} }
$this->process = new Process(function (Process $process) { Coroutine::create(function () {
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]); proc_open('php ' . APP_PATH . ' kiri.php sw:server restart', [], $pipes);
},null,null,FALSE); });
$this->process->start();
} }