This commit is contained in:
2020-09-18 21:17:44 +08:00
parent 6e6c9af887
commit 8b450ef1f0
11 changed files with 6 additions and 41 deletions
+3 -11
View File
@@ -55,27 +55,19 @@ abstract class Callback extends Application
/**
* @param $message
* @param $event
* @param Event $event
* @throws Exception
*/
private function eventNotify($message, $event)
private function eventNotify($message, Event $event)
{
switch ($message) {
case self::EVENT_ERROR:
if (!$event->exists(Event::SERVER_WORKER_ERROR)) {
return;
}
$event->trigger(Event::SERVER_WORKER_ERROR);
break;
case self::EVENT_EXIT:
if (!$event->exists(Event::SERVER_WORKER_EXIT)) {
return;
}
$event->trigger(Event::SERVER_WORKER_EXIT);
break;
case self::EVENT_STOP:
if (!$event->exists(Event::SERVER_WORKER_STOP)) {
return;
}
$event->trigger(Event::SERVER_WORKER_STOP);
break;
}
-3
View File
@@ -27,9 +27,6 @@ class OnAfterReload extends Callback
public function onHandler(Server $server)
{
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_AFTER_RELOAD)) {
return;
}
$event->trigger(Event::SERVER_AFTER_RELOAD, [$server]);
}
-3
View File
@@ -24,9 +24,6 @@ class OnBeforeReload extends Callback
public function onHandler(Server $server)
{
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_BEFORE_RELOAD)) {
return;
}
$event->trigger(Event::SERVER_BEFORE_RELOAD, [$server]);
}
-3
View File
@@ -28,9 +28,6 @@ class OnConnect extends Callback
public function onHandler(\Swoole\Server $server, int $fd, int $reactorId)
{
$event = Snowflake::app()->event;
if (!$event->exists(Event::RECEIVE_CONNECTION)) {
return;
}
$event->trigger(Event::RECEIVE_CONNECTION, [$server, $fd, $reactorId]);
}
+1 -3
View File
@@ -22,9 +22,7 @@ class OnManagerStart extends Callback
Snowflake::setWorkerId($server->manager_pid);
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_START)) {
$events->trigger(Event::SERVER_MANAGER_START, null, $server);
}
$events->trigger(Event::SERVER_MANAGER_START, null, $server);
if (Snowflake::isLinux()) {
name('Server Manager.');
}
+1 -3
View File
@@ -25,9 +25,7 @@ class OnManagerStop extends Callback
$this->warning('manager stop.');
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_STOP)) {
$events->trigger(Event::SERVER_MANAGER_STOP, [$server]);
}
$events->trigger(Event::SERVER_MANAGER_STOP, [$server]);
// $runPath = storage(null, 'workerIds');
// foreach (glob($runPath . '/*') as $item) {
-3
View File
@@ -29,9 +29,6 @@ class OnPipeMessage extends Callback
{
// TODO: Implement onHandler() method.
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::PIPE_MESSAGE)) {
return;
}
$events->trigger(Event::PIPE_MESSAGE, [$server, $src_worker_id, $message]);
}
-3
View File
@@ -52,9 +52,6 @@ class OnRequest extends Callback
unset($sResponse, $response);
Context::deleteId('response');
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
return;
}
$events->trigger(Event::EVENT_AFTER_REQUEST, [$sRequest, $params]);
}
}
-3
View File
@@ -35,9 +35,6 @@ class OnShutdown extends Callback
{
$this->system_mail('server shutdown~');
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_SHUTDOWN)) {
return;
}
$event->trigger(Event::SERVER_SHUTDOWN);
}
+1 -3
View File
@@ -22,9 +22,7 @@ class OnStart extends Callback
Snowflake::setProcessId($server->master_pid);
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_EVENT_START)) {
$event->trigger(Event::SERVER_EVENT_START, null, $server);
}
$event->trigger(Event::SERVER_EVENT_START, null, $server);
if (Snowflake::isLinux()) {
name(rtrim(Config::get('id', 'system:'), ':'));
-3
View File
@@ -54,9 +54,6 @@ class OnWorkerStart extends Callback
try {
$this->debug(sprintf('Worker #%d is start.....', $worker_id));
$event = Snowflake::app()->event;
if (!$event->exists(Event::SERVER_WORKER_START)) {
return;
}
$event->trigger(Event::SERVER_WORKER_START, [$worker_id]);
} catch (\Throwable $exception) {
write($exception->getMessage(), 'worker');