modify
This commit is contained in:
@@ -29,7 +29,6 @@ class OnClose extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
$clientInfo = $server->getClientInfo($fd);
|
$clientInfo = $server->getClientInfo($fd);
|
||||||
$event = Snowflake::app()->getEvent();
|
$event = Snowflake::app()->getEvent();
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class OnConnect extends Callback
|
|||||||
{
|
{
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$event = Snowflake::app()->getEvent();
|
$event = Snowflake::app()->getEvent();
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ class OnFinish extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
fire(Event::TASK_FINISH, [$task_id, $data]);
|
fire(Event::TASK_FINISH, [$task_id, $data]);
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ class OnHandshake extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
$this->execute($request, $response);
|
$this->execute($request, $response);
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ class OnMessage extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
if ($frame->opcode === 0x08) {
|
if ($frame->opcode === 0x08) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ class OnPacket extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
\logger_insert();
|
|
||||||
});
|
});
|
||||||
$request = $this->_request($clientInfo, $server, $data);
|
$request = $this->_request($clientInfo, $server, $data);
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class OnPipeMessage extends Callback
|
|||||||
{
|
{
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
match ($swollen_universalize['action'] ?? null) {
|
match ($swollen_universalize['action'] ?? null) {
|
||||||
'kafka' => $this->onKafkaWorker($swollen_universalize),
|
'kafka' => $this->onKafkaWorker($swollen_universalize),
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ class OnReceive extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function (){
|
defer(function (){
|
||||||
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
\logger_insert();
|
|
||||||
});
|
});
|
||||||
$request = $this->_request($fd, $data, $reID);
|
$request = $this->_request($fd, $data, $reID);
|
||||||
if (($node = $this->router->find_path($request)) === null) {
|
if (($node = $this->router->find_path($request)) === null) {
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ class OnRequest extends Callback
|
|||||||
public function init()
|
public function init()
|
||||||
{
|
{
|
||||||
$this->event = Snowflake::app()->getEvent();
|
$this->event = Snowflake::app()->getEvent();
|
||||||
$this->logger = Snowflake::app()->getLogger();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -48,8 +47,7 @@ class OnRequest extends Callback
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
$this->event->trigger(Event::SYSTEM_RESOURCE_RELEASES);
|
fire(Event::SYSTEM_RESOURCE_RELEASES);
|
||||||
$this->logger->insert();
|
|
||||||
});
|
});
|
||||||
/** @var HRequest $request */
|
/** @var HRequest $request */
|
||||||
[$request, $response] = OnRequest::createContext($request, $response);
|
[$request, $response] = OnRequest::createContext($request, $response);
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ class OnTask extends Callback
|
|||||||
try {
|
try {
|
||||||
defer(function () {
|
defer(function () {
|
||||||
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
||||||
logger_insert();
|
|
||||||
});
|
});
|
||||||
$serialize = $this->before($data);
|
$serialize = $this->before($data);
|
||||||
if ($serialize === null) {
|
if ($serialize === null) {
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ class OnWorkerError extends Callback
|
|||||||
);
|
);
|
||||||
|
|
||||||
write($message, 'worker-exit');
|
write($message, 'worker-exit');
|
||||||
|
|
||||||
logger_insert();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,14 +25,13 @@ class OnWorkerExit extends Callback
|
|||||||
public function onHandler($server, $worker_id)
|
public function onHandler($server, $worker_id)
|
||||||
{
|
{
|
||||||
putenv('state=exit');
|
putenv('state=exit');
|
||||||
|
$event = Snowflake::app()->getEvent();
|
||||||
$channel = Snowflake::app()->getChannel();
|
$channel = Snowflake::app()->getChannel();
|
||||||
$channel->cleanAll();
|
$channel->cleanAll();
|
||||||
|
|
||||||
$event = Snowflake::app()->getEvent();
|
|
||||||
$event->trigger(Event::SERVER_WORKER_EXIT);
|
$event->trigger(Event::SERVER_WORKER_EXIT);
|
||||||
|
|
||||||
logger_insert();
|
logger()->insert();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,9 +32,9 @@ class OnWorkerStop extends Callback
|
|||||||
$this->clearMysqlClient();
|
$this->clearMysqlClient();
|
||||||
$this->clearRedisClient();
|
$this->clearRedisClient();
|
||||||
|
|
||||||
Timer::clearAll();
|
fire(Event::SYSTEM_RESOURCE_CLEAN);
|
||||||
|
|
||||||
logger_insert();
|
Timer::clearAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-1
@@ -14,6 +14,7 @@ use HttpServer\Http\Context;
|
|||||||
use Snowflake\Abstracts\Component;
|
use Snowflake\Abstracts\Component;
|
||||||
use Snowflake\Abstracts\Config;
|
use Snowflake\Abstracts\Config;
|
||||||
use Snowflake\Core\Json;
|
use Snowflake\Core\Json;
|
||||||
|
use Snowflake\Event;
|
||||||
use Snowflake\Snowflake;
|
use Snowflake\Snowflake;
|
||||||
use Swoole\Coroutine;
|
use Swoole\Coroutine;
|
||||||
use Swoole\Coroutine\Channel;
|
use Swoole\Coroutine\Channel;
|
||||||
@@ -30,6 +31,14 @@ class Logger extends Component
|
|||||||
private array $logs = [];
|
private array $logs = [];
|
||||||
|
|
||||||
|
|
||||||
|
public function init()
|
||||||
|
{
|
||||||
|
$event = Snowflake::app()->getEvent();
|
||||||
|
$event->on(Event::SYSTEM_RESOURCE_CLEAN, [$this, 'insert']);
|
||||||
|
$event->on(Event::SYSTEM_RESOURCE_RELEASES, [$this, 'insert']);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $message
|
* @param $message
|
||||||
* @param string $method
|
* @param string $method
|
||||||
@@ -95,7 +104,10 @@ class Logger extends Component
|
|||||||
$message = $this->arrayFormat($message);
|
$message = $this->arrayFormat($message);
|
||||||
}
|
}
|
||||||
if (!empty($message)) {
|
if (!empty($message)) {
|
||||||
$this->write($message, $method);
|
if (!is_array($this->logs)) {
|
||||||
|
$this->logs = [];
|
||||||
|
}
|
||||||
|
$this->logs[] = [$method, $message];
|
||||||
}
|
}
|
||||||
return $message;
|
return $message;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -426,18 +426,6 @@ if (!function_exists('logger')) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!function_exists('logger_insert')) {
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
function logger_insert(): void
|
|
||||||
{
|
|
||||||
Snowflake::app()->getLogger()->insert();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!function_exists('get_file_extension')) {
|
if (!function_exists('get_file_extension')) {
|
||||||
|
|
||||||
function get_file_extension($filename)
|
function get_file_extension($filename)
|
||||||
|
|||||||
Reference in New Issue
Block a user