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

111

Browse Source
This commit is contained in:
as2252258@163.com
2021-09-20 00:52:44 +08:00
parent 37aa5519ac
commit 8734941ba6
3 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-server/ServerCommand.php
+74 -59
View File
@@ -15,6 +15,7 @@ use Server\Events\OnWorkerStart;
use Server\Worker\OnServerWorker; use Server\Worker\OnServerWorker;
use Server\Worker\OnWorkerStart as WorkerDispatch; use Server\Worker\OnWorkerStart as WorkerDispatch;
use Server\Worker\OnTaskerStart as TaskerDispatch; use Server\Worker\OnTaskerStart as TaskerDispatch;
use Swoole\Coroutine;
use Swoole\Runtime; use Swoole\Runtime;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -29,74 +30,88 @@ class ServerCommand extends Command
{ {
const ACTIONS = ['start', 'stop', 'restart']; const ACTIONS = ['start', 'stop', 'restart'];
/** /**
* @var EventProvider * @var EventProvider
*/ */
#[Inject(EventProvider::class)] #[Inject(EventProvider::class)]
public EventProvider $eventProvider; public EventProvider $eventProvider;
/** /**
* *
*/ */
protected function configure() protected function configure()
{ {
$this->setName('sw:server') $this->setName('sw:server')
->setDescription('server start|stop|reload|restart') ->setDescription('server start|stop|reload|restart')
->addArgument('action', InputArgument::REQUIRED) ->addArgument('action', InputArgument::REQUIRED)
->addArgument('daemon', InputArgument::OPTIONAL, '', 0); ->addArgument('daemon', InputArgument::OPTIONAL, '', 0);
} }
/** /**
* @param InputInterface $input * @param InputInterface $input
* @param OutputInterface $output * @param OutputInterface $output
* @return int * @return int
* @throws Exception * @throws Exception
*/ */
public function execute(InputInterface $input, OutputInterface $output): int public function execute(InputInterface $input, OutputInterface $output): int
{ {
try { try {
$manager = Kiri::app()->getServer(); $manager = Kiri::app()->getServer();
$manager->setDaemon($input->getArgument('daemon')); $manager->setDaemon($input->getArgument('daemon'));
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.');
} }
if ($manager->isRunner() && $input->getArgument('action') == 'start') { if ($manager->isRunner() && $input->getArgument('action') == 'start') {
throw new Exception('Service is running. Please use restart.'); throw new Exception('Service is running. Please use restart.');
} }
$manager->shutdown(); $manager->shutdown();
if ($input->getArgument('action') == 'stop') { if ($input->getArgument('action') == 'stop') {
throw new Exception('shutdown success'); throw new Exception('shutdown success');
} }
$enable_coroutine = Config::get('servers.settings.enable_coroutine', false); $this->generate_runtime_builder($manager);
if ($enable_coroutine === true) { } catch (\Throwable $throwable) {
Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION); $output->write($throwable->getMessage());
} } finally {
$this->generate_runtime_builder($manager); return 1;
} catch (\Throwable $throwable) { }
$output->write($throwable->getMessage()); }
} finally {
return 1;
}
}
/** private function configure_set()
* @param $manager {
*/ $enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
private function generate_runtime_builder($manager): void if ($enable_coroutine == true) {
{ return;
exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder'); }
Coroutine::set([
'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
'enable_deadlock_check' => false,
'exit_condition' => function () {
return Coroutine::stats()['coroutine_num'] === 0;
}
]);
}
$this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']);
$this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
$this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']);
$manager->start(); /**
} * @param $manager
*/
private function generate_runtime_builder($manager): void
{
$this->configure_set();
exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder');
$this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']);
$this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
$this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']);
$manager->start();
}
} }
http-server/Worker/OnTaskerStart.php
+1 -4
View File
@@ -2,7 +2,6 @@
namespace Server\Worker; namespace Server\Worker;
use Kiri\Abstracts\Config;
use Kiri\Kiri; use Kiri\Kiri;
use Psr\EventDispatcher\EventDispatcherInterface; use Psr\EventDispatcher\EventDispatcherInterface;
use Server\ServerManager; use Server\ServerManager;
@@ -17,8 +16,6 @@ class OnTaskerStart extends WorkerStart implements EventDispatcherInterface
*/ */
public function dispatch(object $event) public function dispatch(object $event)
{ {
$isWorker = $event->workerId < $event->server->setting['worker_num'];
$time = microtime(true); $time = microtime(true);
ServerManager::setEnv('environmental', Kiri::TASK); ServerManager::setEnv('environmental', Kiri::TASK);
@@ -26,7 +23,7 @@ class OnTaskerStart extends WorkerStart implements EventDispatcherInterface
$this->interpretDirectory(); $this->interpretDirectory();
} }
$this->mixed($event, $isWorker, $time); $this->mixed($event, false, $time);
} }
http-server/Worker/OnWorkerStart.php
+1 -3
View File
@@ -27,8 +27,6 @@ class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
*/ */
public function dispatch(object $event) public function dispatch(object $event)
{ {
$isWorker = $event->workerId < $event->server->setting['worker_num'];
$time = microtime(true); $time = microtime(true);
ServerManager::setEnv('environmental', Kiri::WORKER); ServerManager::setEnv('environmental', Kiri::WORKER);
@@ -36,7 +34,7 @@ class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
$this->router->read_files(); $this->router->read_files();
$this->interpretDirectory(); $this->interpretDirectory();
} }
$this->mixed($event, $isWorker, $time); $this->mixed($event, true, $time);
} }
} }