From c4fbd60bbc12a091c6d7f046a620f3c7a18fd6e8 Mon Sep 17 00:00:00 2001 From: augushong Date: Tue, 2 Jun 2026 20:09:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(timer):=20=E4=BF=AE=E6=AD=A3=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E5=8F=82=E6=95=B0=E6=8B=BC=E5=86=99=20quit?= =?UTF-8?q?=20->=20quiet=EF=BC=88=E9=9D=99=E9=BB=98=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/base/common/command/TimerBase.php | 4 ++-- source/stack/base-build/source/docker/run.sh | 2 +- source/stack/docker-dev-sync/source/docker/run.sh | 2 +- source/stack/docker-dev/source/docker/run.sh | 2 +- source/stack/docker-serve/source/docker/run.sh | 2 +- source/stack/full/source/docker/run.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extend/base/common/command/TimerBase.php b/extend/base/common/command/TimerBase.php index dfc2632..36d6b4b 100644 --- a/extend/base/common/command/TimerBase.php +++ b/extend/base/common/command/TimerBase.php @@ -35,7 +35,7 @@ class TimerBase extends Command // 指令配置 $this->setName('timer') ->addOption('temp', null, Option::VALUE_NONE) - ->addOption('quit', null, Option::VALUE_NONE) + ->addOption('quiet', null, Option::VALUE_NONE) ->addOption('local', null, Option::VALUE_NONE) ->addOption('local-host', null, Option::VALUE_OPTIONAL, '本地域名', 'http://localhost') ->addOption('local-port', null, Option::VALUE_OPTIONAL, '本地端口', '8000') @@ -352,7 +352,7 @@ class TimerBase extends Command } if (empty($list_promises)) { - if (!$input->hasOption('quit')) { + if (!$input->hasOption('quiet')) { $output->writeln(date('Y-m-d H:i:s') . ' no request'); } } else { diff --git a/source/stack/base-build/source/docker/run.sh b/source/stack/base-build/source/docker/run.sh index 5ee4601..31c2327 100644 --- a/source/stack/base-build/source/docker/run.sh +++ b/source/stack/base-build/source/docker/run.sh @@ -27,7 +27,7 @@ echo "参数为:$@" if [ "$1" = "server" ] || [ "$1" = "" ]; then # 运行定时任务 TODO:以指定用户运行 - su - www-data -c "nohup php /var/www/html/think timer --local --quit &" + su - www-data -c "nohup php /var/www/html/think timer --local --quiet &" # 运行nginx service nginx start # 运行php-fpm diff --git a/source/stack/docker-dev-sync/source/docker/run.sh b/source/stack/docker-dev-sync/source/docker/run.sh index 70ea356..4ccd32f 100644 --- a/source/stack/docker-dev-sync/source/docker/run.sh +++ b/source/stack/docker-dev-sync/source/docker/run.sh @@ -52,7 +52,7 @@ echo "参数为:$@" if [ "$1" = "server" ] || [ "$1" = "" ]; then # Run timer (background) - su -www-data -c "nohup php /var/www/html/think timer --local --quit &" + su -www-data -c "nohup php /var/www/html/think timer --local --quiet &" # Run nginx service nginx start # Run php-fpm (foreground, keeps container alive) diff --git a/source/stack/docker-dev/source/docker/run.sh b/source/stack/docker-dev/source/docker/run.sh index 459df17..b7f54be 100644 --- a/source/stack/docker-dev/source/docker/run.sh +++ b/source/stack/docker-dev/source/docker/run.sh @@ -31,7 +31,7 @@ echo "参数为:$@" if [ "$1" = "server" ] || [ "$1" = "" ]; then # 运行定时任务 TODO:以指定用户运行 - su -www-data -c "nohup php /var/www/html/think timer --local --quit &" + su -www-data -c "nohup php /var/www/html/think timer --local --quiet &" # 运行nginx service nginx start # 运行php-fpm diff --git a/source/stack/docker-serve/source/docker/run.sh b/source/stack/docker-serve/source/docker/run.sh index 5ee4601..31c2327 100644 --- a/source/stack/docker-serve/source/docker/run.sh +++ b/source/stack/docker-serve/source/docker/run.sh @@ -27,7 +27,7 @@ echo "参数为:$@" if [ "$1" = "server" ] || [ "$1" = "" ]; then # 运行定时任务 TODO:以指定用户运行 - su - www-data -c "nohup php /var/www/html/think timer --local --quit &" + su - www-data -c "nohup php /var/www/html/think timer --local --quiet &" # 运行nginx service nginx start # 运行php-fpm diff --git a/source/stack/full/source/docker/run.sh b/source/stack/full/source/docker/run.sh index 5ee4601..31c2327 100644 --- a/source/stack/full/source/docker/run.sh +++ b/source/stack/full/source/docker/run.sh @@ -27,7 +27,7 @@ echo "参数为:$@" if [ "$1" = "server" ] || [ "$1" = "" ]; then # 运行定时任务 TODO:以指定用户运行 - su - www-data -c "nohup php /var/www/html/think timer --local --quit &" + su - www-data -c "nohup php /var/www/html/think timer --local --quiet &" # 运行nginx service nginx start # 运行php-fpm