This commit is contained in:
2020-09-03 11:39:20 +08:00
parent 274332207b
commit efbb049824
42 changed files with 101 additions and 101 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ class OnAfterReload extends Callback
*/
public function onHandler(Server $server)
{
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_AFTER_RELOAD)) {
return;
}
+1 -1
View File
@@ -23,7 +23,7 @@ class OnBeforeReload extends Callback
*/
public function onHandler(Server $server)
{
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_BEFORE_RELOAD)) {
return;
}
+5 -5
View File
@@ -38,10 +38,10 @@ class OnClose extends Callback
} catch (\Throwable $exception) {
$this->addError($exception->getMessage());
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::RELEASE_ALL);
$logger = Snowflake::get()->getLogger();
$logger = Snowflake::app()->getLogger();
$logger->insert();
}
}
@@ -59,13 +59,13 @@ class OnClose extends Callback
if (!$server->isEstablished($fd)) {
return [null, null];
}
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
$name = $manager->getName(AWebsocket::CLOSE);
} else if ($server instanceof HServer) {
$manager = Snowflake::get()->annotation->get('http');
$manager = Snowflake::app()->annotation->get('http');
$name = $manager->getName(Annotation::CLOSE);
} else {
$manager = Snowflake::get()->annotation->get('tcp');
$manager = Snowflake::app()->annotation->get('tcp');
$name = $manager->getName(Tcp::CLOSE);
}
return [$manager, $name];
+1 -1
View File
@@ -27,7 +27,7 @@ class OnConnect extends Callback
*/
public function onHandler(\Swoole\Server $server, int $fd, int $reactorId)
{
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if (!$event->exists(Event::RECEIVE_CONNECTION)) {
return;
}
+1 -1
View File
@@ -53,7 +53,7 @@ class OnHandshake extends Callback
}
/** @var AWebsocket $manager */
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
if ($manager->has($manager->getName(AWebsocket::HANDSHAKE))) {
$manager->runWith($manager->getName(AWebsocket::HANDSHAKE), [$request, $response]);
} else {
+1 -1
View File
@@ -21,7 +21,7 @@ class OnManagerStart extends Callback
$this->debug('manager start.');
Snowflake::setProcessId($server->manager_pid);
$events = Snowflake::get()->event;
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_START)) {
$events->trigger(Event::SERVER_MANAGER_START, null, $server);
}
+1 -1
View File
@@ -24,7 +24,7 @@ class OnManagerStop extends Callback
{
$this->warning('manager stop.');
$events = Snowflake::get()->event;
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_STOP)) {
$events->trigger(Event::SERVER_MANAGER_STOP, [$server]);
}
+4 -4
View File
@@ -29,7 +29,7 @@ class OnMessage extends Callback
if ($frame->opcode == 0x08) {
return;
}
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_MESSAGE)) {
$event->trigger(Event::SERVER_MESSAGE, [$server, $frame]);
} else {
@@ -37,7 +37,7 @@ class OnMessage extends Callback
}
/** @var AWebsocket $manager */
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
if (!isset($frame->data['route'])) {
throw new \Exception('Fromat errr.');
}
@@ -47,9 +47,9 @@ class OnMessage extends Callback
$this->addError($exception->getMessage(), 'websocket');
$server->send($frame->fd, $exception->getMessage());
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::EVENT_AFTER_REQUEST);
Snowflake::get()->logger->insert();
Snowflake::app()->logger->insert();
}
}
+1 -1
View File
@@ -78,7 +78,7 @@ class OnPacket extends Callback
$client[] = $this->pack(['message' => $exception->getMessage()]);
return $server->sendto(...$client);
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::SERVER_WORKER_STOP);
}
}
+1 -1
View File
@@ -28,7 +28,7 @@ class OnPipeMessage extends Callback
public function onHandler(Server $server, int $src_worker_id, $message)
{
// TODO: Implement onHandler() method.
$events = Snowflake::get()->getEvent();
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::PIPE_MESSAGE)) {
return;
}
+1 -1
View File
@@ -78,7 +78,7 @@ class OnReceive extends Callback
$client[] = $this->pack(['message' => $exception->getMessage()]);
return $server->send(...$client);
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::SERVER_WORKER_STOP);
}
}
+3 -3
View File
@@ -39,11 +39,11 @@ class OnRequest extends Callback
if ($sRequest->is('favicon.ico')) {
return $sResponse->send($sRequest->isNotFound(), 200);
}
$sResponse->send(Snowflake::get()->router->dispatch(), 200);
$sResponse->send(Snowflake::app()->router->dispatch(), 200);
} catch (Error | \Throwable $exception) {
$this->sendErrorMessage($sResponse ?? null, $exception, $response);
} finally {
$events = Snowflake::get()->getEvent();
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
return;
}
@@ -85,7 +85,7 @@ class OnRequest extends Callback
$code = $exception->getCode() ?? 500;
$trance = array_slice($exception->getTrace(), 0, 10);
Snowflake::get()->logger->write(print_r($trance, true), 'exception');
Snowflake::app()->logger->write(print_r($trance, true), 'exception');
return JSON::to($code, $errorInfo['message']);
}
+1 -1
View File
@@ -33,7 +33,7 @@ class OnShutdown extends Callback
public function onHandler(Server $server)
{
$this->system_mail('server shutdown~');
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_SHUTDOWN)) {
return;
}
+1 -1
View File
@@ -21,7 +21,7 @@ class OnStart extends Callback
$time = storage('socket.sock');
Snowflake::writeFile($time, $server->master_pid);
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_EVENT_START)) {
$event->trigger(Event::SERVER_EVENT_START, null, $server);
}
+1 -1
View File
@@ -108,7 +108,7 @@ class OnTask extends Callback
$finish['info'] = $this->format($exception);
$this->error($exception, 'Task');
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::RELEASE_ALL);
Timer::clearAll();
}
+2 -2
View File
@@ -52,13 +52,13 @@ class OnWorkerStart extends Callback
{
try {
$this->debug(sprintf('Worker #%d is start.....', $worker_id));
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if (!$event->exists(Event::SERVER_WORKER_START)) {
return;
}
$event->trigger(Event::SERVER_WORKER_START);
} catch (\Throwable $exception) {
Snowflake::get()->getLogger()->write($exception->getMessage(), 'worker');
Snowflake::app()->getLogger()->write($exception->getMessage(), 'worker');
}
}