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

改名

Browse Source
This commit is contained in:
Mr·x
2020-09-02 17:46:30 +08:00
parent 7adad560dd
commit 81501fca32
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-server/Server.php
+33 -14
View File
@@ -18,6 +18,7 @@ use Exception;
use ReflectionException; use ReflectionException;
use Snowflake\Config; use Snowflake\Config;
use Snowflake\Event; use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Exception\ConfigException; use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
@@ -170,16 +171,7 @@ class Server extends Application
$class = $this->dispatch($config['type']); $class = $this->dispatch($config['type']);
$this->baseServer = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']); $this->baseServer = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']);
$this->baseServer->set($settings); $this->baseServer->set($settings);
$this->bindAnnotation();
if ($this->baseServer instanceof WebSocket) {
if (!$event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadWebsocketHandler'])) {
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadWebsocketHandler']);
}
} else if ($this->baseServer instanceof Http) {
if (!$event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler'])) {
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler']);
}
}
} else { } else {
$newListener = $this->baseServer->addlistener($config['host'], $config['port'], $config['mode']); $newListener = $this->baseServer->addlistener($config['host'], $config['port'], $config['mode']);
if (isset($config['settings']) && is_array($config['settings'])) { if (isset($config['settings']) && is_array($config['settings'])) {
@@ -191,6 +183,27 @@ class Server extends Application
} }
/**
* @throws Exception
*/
private function bindAnnotation()
{
$event = Snowflake::get()->event;
if ($this->baseServer instanceof WebSocket) {
if ($event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadWebsocketHandler'])) {
return;
}
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadWebsocketHandler']);
}
if ($this->baseServer instanceof Http) {
if ($event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler'])) {
return;
}
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler']);
}
}
/** /**
* @param $config * @param $config
* @param $newListener * @param $newListener
@@ -204,9 +217,6 @@ class Server extends Application
$this->debug(sprintf('Listener %s::%d', $config['host'], $config['port'])); $this->debug(sprintf('Listener %s::%d', $config['host'], $config['port']));
if ($config['type'] == self::HTTP) { if ($config['type'] == self::HTTP) {
$this->onBind($newListener, 'request', [Snowflake::createObject(OnRequest::class), 'onHandler']); $this->onBind($newListener, 'request', [Snowflake::createObject(OnRequest::class), 'onHandler']);
if (!$event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler'])) {
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler']);
}
} else if ($config['type'] == self::TCP || $config['type'] == self::PACKAGE) { } else if ($config['type'] == self::TCP || $config['type'] == self::PACKAGE) {
$this->onBind($newListener, 'connect', [Snowflake::createObject(OnConnect::class), 'onHandler']); $this->onBind($newListener, 'connect', [Snowflake::createObject(OnConnect::class), 'onHandler']);
$this->onBind($newListener, 'close', [Snowflake::createObject(OnClose::class), 'onHandler']); $this->onBind($newListener, 'close', [Snowflake::createObject(OnClose::class), 'onHandler']);
@@ -224,14 +234,23 @@ class Server extends Application
* @param $server * @param $server
* @param $name * @param $name
* @param $callback * @param $callback
* @throws Exception
*/ */
private function onBind($server, $name, $callback) private function onBind($server, $name, $callback)
{ {
if (in_array($name, $this->listening)) { if (in_array($name, $this->listening)) {
return; return;
} }
$this->listening[] = $name; array_push($this->listening, $name);
$server->on($name, $callback); $server->on($name, $callback);
$event = Snowflake::get()->event;
if ($name === 'request') {
if ($event->exists(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler'])) {
return;
}
$event->on(Event::SERVER_WORKER_START, [$this, 'onLoadHttpHandler']);
}
} }