zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 15:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 2.5.0-b4 (build 414)

Browse Source
This commit is contained in:
crazywhalecc
2021-07-09 02:15:04 +08:00
parent 481063285b
commit e57cc43500
8 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/Command/Daemon/DaemonStatusCommand.php
View File

@@ -20,7 +20,7 @@ class DaemonStatusCommand extends DaemonCommand
$output->writeln("<comment>----- 以下是stdout内容 -----</comment>");
$stdout = file_get_contents($this->daemon_file["stdout"]);
$stdout = explode("\n", $stdout);
for ($i = 10; $i > 0; --$i) {
for ($i = 15; $i > 0; --$i) {
if (isset($stdout[count($stdout) - $i]))
echo $stdout[count($stdout) - $i] . PHP_EOL;
}

14
src/ZM/Command/Daemon/DaemonStopCommand.php
View File

@@ -18,9 +18,17 @@ class DaemonStopCommand extends DaemonCommand
protected function execute(InputInterface $input, OutputInterface $output): int {
parent::execute($input, $output);
Process::kill(intval($this->daemon_file["pid"]), SIGINT);
unlink(DataProvider::getWorkingDir() . "/.daemon_pid");
$output->writeln("<info>成功停止！</info>");
Process::kill(intval($this->daemon_file["pid"]), SIGTERM);
$i = 10;
while (file_exists(DataProvider::getWorkingDir() . "/.daemon_pid") && $i > 0) {
sleep(1);
--$i;
}
if ($i === 0) {
$output->writeln("<error>停止失败，请检查进程pid #" . $this->daemon_file["pid"] . " 是否响应！</error>");
} else {
$output->writeln("<info>成功停止！</info>");
}
return 0;
}
}