From 15d4ea710a3c49361cf1c4eeeed2e2d18ee6ab2b Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 20 Mar 2022 21:04:07 +0800 Subject: [PATCH] add --no-state-check option (build 446) --- src/ZM/Command/RunServerCommand.php | 11 +++++++---- src/ZM/ConsoleApplication.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ZM/Command/RunServerCommand.php b/src/ZM/Command/RunServerCommand.php index 43eea118..34b81116 100644 --- a/src/ZM/Command/RunServerCommand.php +++ b/src/ZM/Command/RunServerCommand.php @@ -46,6 +46,7 @@ class RunServerCommand extends Command new InputOption('preview', null, null, '只显示参数,不启动服务器'), new InputOption('force-load-module', null, InputOption::VALUE_OPTIONAL, '强制打包状态下加载模块(使用英文逗号分割多个)'), new InputOption('polling-watch', null, null, '强制启用轮询模式监听'), + new InputOption('no-state-check', null, null, '关闭启动前框架运行状态检查'), ]); $this->setDescription('Run zhamao-framework | 启动框架'); $this->setHelp('直接运行可以启动'); @@ -60,10 +61,12 @@ class RunServerCommand extends Command } } $state = Framework::getProcessState(ZM_PROCESS_MASTER); - if (is_array($state) && posix_getsid($state['pid'] ?? -1) !== false) { - $output->writeln("检测到已经在 pid: {$state['pid']} 进程启动了框架!"); - $output->writeln('不可以同时启动两个框架!'); - return 1; + if (!$input->getOption('no-state-check')) { + if (is_array($state) && posix_getsid($state['pid'] ?? -1) !== false) { + $output->writeln("检测到已经在 pid: {$state['pid']} 进程启动了框架!"); + $output->writeln('不可以同时启动两个框架!'); + return 1; + } } (new Framework($input->getOptions()))->start(); return 0; diff --git a/src/ZM/ConsoleApplication.php b/src/ZM/ConsoleApplication.php index 2a79c48f..e4a4d379 100644 --- a/src/ZM/ConsoleApplication.php +++ b/src/ZM/ConsoleApplication.php @@ -28,7 +28,7 @@ use ZM\Exception\InitException; class ConsoleApplication extends Application { - public const VERSION_ID = 445; + public const VERSION_ID = 446; public const VERSION = '2.7.0-beta5';