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

add --no-state-check option (build 446)

Browse Source
This commit is contained in:
crazywhalecc
2022-03-20 21:04:07 +08:00
parent f0541c1f32
commit 15d4ea710a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ZM/Command/RunServerCommand.php
View File

@@ -46,6 +46,7 @@ class RunServerCommand extends Command
new InputOption('preview', null, null, '只显示参数，不启动服务器'), new InputOption('preview', null, null, '只显示参数，不启动服务器'),
new InputOption('force-load-module', null, InputOption::VALUE_OPTIONAL, '强制打包状态下加载模块（使用英文逗号分割多个）'), new InputOption('force-load-module', null, InputOption::VALUE_OPTIONAL, '强制打包状态下加载模块（使用英文逗号分割多个）'),
new InputOption('polling-watch', null, null, '强制启用轮询模式监听'), new InputOption('polling-watch', null, null, '强制启用轮询模式监听'),
new InputOption('no-state-check', null, null, '关闭启动前框架运行状态检查'),
]); ]);
$this->setDescription('Run zhamao-framework | 启动框架'); $this->setDescription('Run zhamao-framework | 启动框架');
$this->setHelp('直接运行可以启动'); $this->setHelp('直接运行可以启动');
@@ -60,10 +61,12 @@ class RunServerCommand extends Command
} }
} }
$state = Framework::getProcessState(ZM_PROCESS_MASTER); $state = Framework::getProcessState(ZM_PROCESS_MASTER);
if (is_array($state) && posix_getsid($state['pid'] ?? -1) !== false) { if (!$input->getOption('no-state-check')) {
$output->writeln("<error>检测到已经在 pid: {$state['pid']} 进程启动了框架！</error>"); if (is_array($state) && posix_getsid($state['pid'] ?? -1) !== false) {
$output->writeln('<error>不可以同时启动两个框架！</error>'); $output->writeln("<error>检测到已经在 pid: {$state['pid']} 进程启动了框架！</error>");
return 1; $output->writeln('<error>不可以同时启动两个框架！</error>');
return 1;
}
} }
(new Framework($input->getOptions()))->start(); (new Framework($input->getOptions()))->start();
return 0; return 0;

2
src/ZM/ConsoleApplication.php
View File

@@ -28,7 +28,7 @@ use ZM\Exception\InitException;
class ConsoleApplication extends Application class ConsoleApplication extends Application
{ {
public const VERSION_ID = 445; public const VERSION_ID = 446;
public const VERSION = '2.7.0-beta5'; public const VERSION = '2.7.0-beta5';