as2252258/kiri-http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
向林
2021-12-06 13:51:54 +08:00
parent 308c992fd3
commit 94a522588d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server.php
+2 -1
View File
@@ -137,8 +137,9 @@ class Server extends HttpService
/** /**
* @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
* @throws \ReflectionException
*/ */
#[Pure] public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
{ {
return $this->manager->getServer(); return $this->manager->getServer();
} }
ServerCommand.php
+8 -7
View File
@@ -4,12 +4,13 @@ declare(strict_types=1);
namespace Server; namespace Server;
use Note\Inject;
use Exception; use Exception;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Note\Inject; use Server\Events\OnServerBeforeStart;
use Swoole\Coroutine; use Swoole\Coroutine;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -63,12 +64,12 @@ class ServerCommand extends Command
if (!in_array($input->getArgument('action'), self::ACTIONS)) { if (!in_array($input->getArgument('action'), self::ACTIONS)) {
throw new Exception('I don\'t know what I want to do.'); throw new Exception('I don\'t know what I want to do.');
} }
$action = $input->getArgument('action'); if ($manager->isRunner() && $input->getArgument('action') == 'start') {
if ($action == 'stop' || $action == 'restart') { throw new Exception('Service is running. Please use restart.');
$manager->shutdown();
if ($action == 'stop') {
return 0;
} }
$manager->shutdown();
if ($input->getArgument('action') == 'stop') {
return 0;
} }
return $this->generate_runtime_builder($manager); return $this->generate_runtime_builder($manager);
} }
@@ -86,7 +87,7 @@ class ServerCommand extends Command
Coroutine::set([ Coroutine::set([
'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION, 'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
'enable_deadlock_check' => FALSE, 'enable_deadlock_check' => FALSE,
'exit_condition' => static function () { 'exit_condition' => function () {
return Coroutine::stats()['coroutine_num'] === 0; return Coroutine::stats()['coroutine_num'] === 0;
} }
]); ]);