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

Revert "改名"

Browse Source 
This reverts commit fdf58326
This commit is contained in:
向林
2022-01-20 19:04:15 +08:00
parent bcd78aba56
commit d22db391f3
8 changed files with 21 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Handler/OnPipeMessage.php
-4
View File
@@ -15,10 +15,6 @@ class OnPipeMessage extends Server
{
/** @var EventDispatch */
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param \Swoole\Server $server
Handler/OnServer.php
+4 -10
View File
@@ -18,13 +18,7 @@ use Kiri\Server\Events\OnStart;
*/
class OnServer extends Server
{
/**
* @var EventDispatch
*/
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param \Swoole\Server $server
@@ -35,7 +29,7 @@ class OnServer extends Server
{
$this->setProcessName(sprintf('start[%d].server', $server->master_pid));
$this->eventDispatch->dispatch(new OnStart($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnStart($server));
}
@@ -45,7 +39,7 @@ class OnServer extends Server
*/
public function onBeforeShutdown(\Swoole\Server $server)
{
$this->eventDispatch->dispatch(new OnBeforeShutdown($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnBeforeShutdown($server));
}
@@ -55,7 +49,7 @@ class OnServer extends Server
*/
public function onShutdown(\Swoole\Server $server)
{
$this->eventDispatch->dispatch(new OnShutdown($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnShutdown($server));
}
Handler/OnServerManager.php
+2 -8
View File
@@ -18,12 +18,6 @@ use Kiri\Server\Events\OnManagerStop;
class OnServerManager extends Server
{
/**
* @var EventDispatch
*/
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param \Swoole\Server $server
@@ -33,7 +27,7 @@ class OnServerManager extends Server
{
$this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
$this->eventDispatch->dispatch(new OnManagerStart($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnManagerStart($server));
}
@@ -43,7 +37,7 @@ class OnServerManager extends Server
*/
public function onManagerStop(\Swoole\Server $server)
{
$this->eventDispatch->dispatch(new OnManagerStop($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnManagerStop($server));
}
Handler/OnServerReload.php
+2 -9
View File
@@ -16,20 +16,13 @@ class OnServerReload
{
/**
* @var EventDispatch
*/
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param Server $server
* @throws \ReflectionException
*/
public function onBeforeReload(Server $server)
{
$this->eventDispatch->dispatch(new OnBeforeReload($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnBeforeReload($server));
}
@@ -39,7 +32,7 @@ class OnServerReload
*/
public function onAfterReload(Server $server)
{
$this->eventDispatch->dispatch(new OnAfterReload($server));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnAfterReload($server));
}
}
Handler/OnServerWorker.php
+8 -15
View File
@@ -9,7 +9,6 @@ use Kiri\Annotation\Inject;
use Kiri\Core\Help;
use Kiri\Events\EventDispatch;
use Kiri\Message\Handler\Router;
use Kiri\Message\Waite;
use Kiri\Server\Events\OnAfterWorkerStart;
use Kiri\Server\Events\OnBeforeWorkerStart;
use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
@@ -29,13 +28,6 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
{
/**
* @var EventDispatch
*/
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
public Router $collector;
@@ -55,19 +47,20 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
*/
public function onWorkerStart(Server $server, int $workerId)
{
$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
$dispatch = \Kiri::getDi()->get(EventDispatch::class);
$dispatch->dispatch(new OnBeforeWorkerStart($workerId));
set_env('environmental_workerId', $workerId);
if ($workerId < $server->setting['worker_num']) {
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
$this->collector->scan_build_route();
$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
$dispatch->dispatch(new OnWorkerStart($server, $workerId));
set_env('environmental', Kiri::WORKER);
} else {
$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
$dispatch->dispatch(new OnTaskStart($server, $workerId));
$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
set_env('environmental', Kiri::TASK);
}
$this->eventDispatch->dispatch(new OnAfterWorkerStart());
$dispatch->dispatch(new OnAfterWorkerStart());
}
@@ -79,7 +72,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
public function onWorkerStop(Server $server, int $workerId)
{
Timer::clearAll();
$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerStop($server, $workerId));
}
@@ -90,7 +83,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
*/
public function onWorkerExit(Server $server, int $workerId)
{
$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerExit($server, $workerId));
}
@@ -104,7 +97,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
*/
public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)
{
$this->eventDispatch->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
$worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
Server.php
+3 -3
View File
@@ -95,9 +95,9 @@ class Server extends HttpService
$processes = array_merge($this->process, Config::get('processes', []));
$this->container->get(ProcessManager::class)->batch($processes);
$this->getContainer()->get(ProcessManager::class)->batch($processes);
$this->eventDispatch->dispatch(new OnServerBeforeStart());
$this->getEventDispatch()->dispatch(new OnServerBeforeStart());
return $this->manager->getServer()->start();
}
@@ -117,7 +117,7 @@ class Server extends HttpService
foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) {
$this->state->exit($config['port']);
}
$this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
$this->getContainer()->get(EventDispatch::class)->dispatch(new OnShutdown());
}
ServerCommand.php
-6
View File
@@ -30,12 +30,6 @@ class ServerCommand extends Command
const ACTIONS = ['start', 'stop', 'restart'];
/**
* @var EventDispatch
*/
#[Inject(EventDispatch::class)]
public EventDispatch $eventProvider;
/**
*
ServerManager.php
+2 -2
View File
@@ -264,7 +264,7 @@ class ServerManager extends Component
$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
$this->container->setBindings(SwooleServerInterface::class, $this->server);
$this->getContainer()->setBindings(SwooleServerInterface::class, $this->server);
$id = Config::get('id', 'system-service');
@@ -298,7 +298,7 @@ class ServerManager extends Component
{
foreach ($events as $name => $event) {
if (is_array($event) && is_string($event[0])) {
$event[0] = $this->container->get($event[0]);
$event[0] = $this->getContainer()->get($event[0]);
}
$server->on($name, $event);
}