modify plugin name
This commit is contained in:
@@ -5,9 +5,7 @@ namespace Kiri\Server\Abstracts;
|
|||||||
use Kiri\Abstracts\Config;
|
use Kiri\Abstracts\Config;
|
||||||
use Kiri\Di\ContainerInterface;
|
use Kiri\Di\ContainerInterface;
|
||||||
use Kiri\Events\EventDispatch;
|
use Kiri\Events\EventDispatch;
|
||||||
use Kiri\Exception\ConfigException;
|
|
||||||
use Kiri\Server\Constant;
|
use Kiri\Server\Constant;
|
||||||
use Kiri\Server\Events\OnShutdown;
|
|
||||||
use Kiri\Server\Events\OnWorkerStart;
|
use Kiri\Server\Events\OnWorkerStart;
|
||||||
use Kiri\Server\Events\OnWorkerStop;
|
use Kiri\Server\Events\OnWorkerStop;
|
||||||
use Kiri\Server\ServerInterface;
|
use Kiri\Server\ServerInterface;
|
||||||
@@ -55,10 +53,16 @@ class CoroutineServer implements ServerInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @return Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null
|
* @return Server|Coroutine\Server|Coroutine\Http\Server|null
|
||||||
*/
|
*/
|
||||||
public function getServer(string $name): Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null
|
public function getServer(string $name = ''): Server|Coroutine\Server|Coroutine\Http\Server|null
|
||||||
{
|
{
|
||||||
|
if (empty($this->servers)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (empty($name)) {
|
||||||
|
return current($this->servers);
|
||||||
|
}
|
||||||
return $this->servers[$name] ?? null;
|
return $this->servers[$name] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ trait TraitServer
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $class
|
* @param array $class
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function addProcess($class): void
|
public function addProcess(array $class): void
|
||||||
{
|
{
|
||||||
$this->_process[] = $class;
|
foreach ($class as $key => $item) {
|
||||||
|
$this->_process[] = $item;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -35,6 +35,7 @@ use Kiri\Message\Constrict\Response;
|
|||||||
use Kiri\Message\Constrict\Request;
|
use Kiri\Message\Constrict\Request;
|
||||||
use Kiri\Server\Abstracts\ProcessManager;
|
use Kiri\Server\Abstracts\ProcessManager;
|
||||||
use Kiri\Server\Abstracts\AsyncServer;
|
use Kiri\Server\Abstracts\AsyncServer;
|
||||||
|
use Kiri\Server\Abstracts\CoroutineServer;
|
||||||
|
|
||||||
|
|
||||||
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
|
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
|
||||||
@@ -54,7 +55,7 @@ class Server extends HttpService
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param State $state
|
* @param State $state
|
||||||
* @param AsyncServer $manager
|
* @param Abstracts\CoroutineServer $manager
|
||||||
* @param ContainerInterface $container
|
* @param ContainerInterface $container
|
||||||
* @param ProcessManager $processManager
|
* @param ProcessManager $processManager
|
||||||
* @param EventDispatch $dispatch
|
* @param EventDispatch $dispatch
|
||||||
@@ -64,7 +65,7 @@ class Server extends HttpService
|
|||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function __construct(public State $state,
|
public function __construct(public State $state,
|
||||||
public AsyncServer $manager,
|
public CoroutineServer $manager,
|
||||||
public ContainerInterface $container,
|
public ContainerInterface $container,
|
||||||
public ProcessManager $processManager,
|
public ProcessManager $processManager,
|
||||||
public EventDispatch $dispatch,
|
public EventDispatch $dispatch,
|
||||||
@@ -129,7 +130,7 @@ class Server extends HttpService
|
|||||||
|
|
||||||
$this->onHotReload();
|
$this->onHotReload();
|
||||||
|
|
||||||
$this->processManager->batch($this->process, $this->manager->getServer());
|
$this->manager->addProcess($this->process);
|
||||||
$this->dispatch->dispatch(new OnServerBeforeStart());
|
$this->dispatch->dispatch(new OnServerBeforeStart());
|
||||||
$this->manager->start();
|
$this->manager->start();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ interface ServerInterface
|
|||||||
* @param string $name
|
* @param string $name
|
||||||
* @return Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null
|
* @return Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null
|
||||||
*/
|
*/
|
||||||
public function getServer(string $name): Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null;
|
public function getServer(string $name = ''): Server|\Swoole\Coroutine\Server|\Swoole\Coroutine\Http\Server|null;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user