From 1ff9d7f210933d6c04c84ea572b83e455ac8c12d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 7 Jan 2022 18:16:29 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fdf58326 --- ServerCommand.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ServerCommand.php b/ServerCommand.php index fb63f01..cadf722 100644 --- a/ServerCommand.php +++ b/ServerCommand.php @@ -64,19 +64,19 @@ class ServerCommand extends Command $manager = Kiri::app()->getServer(); $manager->setDaemon((int)!is_null($input->getOption('daemon'))); if (is_null($input->getArgument('action'))) { - $input->setArgument('action', 'restart'); + throw new Exception('I don\'t know what I want to do.'); } if (!in_array($input->getArgument('action'), self::ACTIONS)) { throw new Exception('I don\'t know what I want to do.'); } - if ($manager->isRunner() && $input->getArgument('action') == 'start') { - throw new Exception('Service is running. Please use restart.'); + if ($input->getArgument('action') == 'restart') { + $manager->shutdown(); + } + if ($input->getArgument('action') != 'stop') { + return $this->generate_runtime_builder($manager); } $manager->shutdown(); - if ($input->getArgument('action') == 'stop') { - return 0; - } - return $this->generate_runtime_builder($manager); + return 0; }