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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-08-11 01:04:57 +08:00
parent 63d8eaa4a5
commit 682246df28
219 changed files with 790 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnAfterReload.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnBeforeReload.php
+4 -4
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
use Swoole\Timer;
@@ -26,8 +26,8 @@ class OnBeforeReload extends Callback
{
Event::trigger(Event::SERVER_BEFORE_RELOAD, [$server]);
Snowflake::clearWorkerPid();
Snowflake::clearTaskPid();
Kiri::clearWorkerPid();
Kiri::clearTaskPid();
}
}
HttpServer/Events/OnClose.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnConnect.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnFinish.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnHandshake.php
+6 -6
View File
@@ -13,10 +13,10 @@ use HttpServer\Http\Request;
use HttpServer\Http\Response;
use HttpServer\Route\Router;
use ReflectionException;
use Snowflake\Core\ArrayAccess;
use Snowflake\Event;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Core\ArrayAccess;
use Kiri\Event;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Http\Request as SRequest;
use Swoole\Http\Response as SResponse;
use Swoole\WebSocket\Server;
@@ -57,7 +57,7 @@ class OnHandshake extends Callback
foreach ($headers as $key => $val) {
$response->header($key, $val);
}
return Snowflake::app()->getRouter();
return Kiri::app()->getRouter();
}
@@ -68,7 +68,7 @@ class OnHandshake extends Callback
*/
private function disconnect(SResponse $response, int $code = 500): void
{
$server = Snowflake::getWebSocket();
$server = Kiri::getWebSocket();
if (!$server->isEstablished($response->fd)) {
return;
}
HttpServer/Events/OnManagerStart.php
+4 -4
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
@@ -26,7 +26,7 @@ class OnManagerStart extends Callback
*/
public function onHandler(Server $server)
{
Snowflake::setWorkerId($server->manager_pid);
Kiri::setWorkerId($server->manager_pid);
fire(Event::SERVER_MANAGER_START, [$server]);
HttpServer/Events/OnManagerStop.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnMessage.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\WebSocket\Frame;
use Swoole\WebSocket\Server;
HttpServer/Events/OnPacket.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Core\Json;
use Snowflake\Event;
use Kiri\Core\Json;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnPipeMessage.php
+4 -4
View File
@@ -7,10 +7,10 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Kafka\Struct;
use Snowflake\Crontab\Crontab;
use Snowflake\Crontab\Producer;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Crontab\Crontab;
use Kiri\Crontab\Producer;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnReceive.php
+3 -3
View File
@@ -7,9 +7,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use HttpServer\Http\Request;
use Snowflake\Abstracts\Config;
use Snowflake\Core\Json;
use Snowflake\Event;
use Kiri\Abstracts\Config;
use Kiri\Core\Json;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnRequest.php
+4 -4
View File
@@ -10,9 +10,9 @@ use HttpServer\Exception\ExitException;
use HttpServer\Http\Request as HRequest;
use HttpServer\Http\Response as HResponse;
use HttpServer\Route\Router;
use Snowflake\Error\Logger;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Error\Logger;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Error;
use Swoole\Http\Request;
use Swoole\Http\Response;
@@ -38,7 +38,7 @@ class OnRequest extends Callback
*/
public function init()
{
$this->router = Snowflake::app()->getRouter();
$this->router = Kiri::app()->getRouter();
}
HttpServer/Events/OnShutdown.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnStart.php
+4 -4
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
@@ -24,7 +24,7 @@ class OnStart extends Callback
*/
public function onHandler(Server $server)
{
if (Snowflake::getPlatform()->isLinux()) {
if (Kiri::getPlatform()->isLinux()) {
name($server->master_pid, 'master');
}
fire(Event::SERVER_EVENT_START, [$server]);
HttpServer/Events/OnTask.php
+4 -4
View File
@@ -8,9 +8,9 @@ namespace HttpServer\Events;
use HttpServer\Abstracts\Callback;
use HttpServer\IInterface\Task;
use HttpServer\IInterface\Task as ITask;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Coroutine;
use Swoole\Process;
use Swoole\Server;
@@ -29,7 +29,7 @@ class OnTask extends Callback
*/
public function onHandler()
{
$setting = Snowflake::app()->getSwoole();
$setting = Kiri::app()->getSwoole();
$isCoroutineTask = $setting->setting['task_enable_coroutine'] ?? false;
if ($isCoroutineTask === true) {
HttpServer/Events/OnWorkerError.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnWorkerExit.php
+3 -3
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Timer;
/**
@@ -28,7 +28,7 @@ class OnWorkerExit extends Callback
Event::trigger(Event::SERVER_WORKER_EXIT, [$server, $worker_id]);
Snowflake::getApp('logger')->insert();
Kiri::getApp('logger')->insert();
}
}
HttpServer/Events/OnWorkerStart.php
+10 -10
View File
@@ -6,11 +6,11 @@ namespace HttpServer\Events;
use Annotation\Annotation;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Exception\ConfigException;
use Snowflake\Runtime;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Exception\ConfigException;
use Kiri\Runtime;
use Kiri\Kiri;
use Swoole\Server;
/**
@@ -32,7 +32,7 @@ class OnWorkerStart extends Callback
{
$this->setConfigs($worker_id);
$annotation = Snowflake::app()->getAnnotation();
$annotation = Kiri::app()->getAnnotation();
$annotation->setLoader(unserialize(file_get_contents(storage(Runtime::CACHE_NAME))));
if ($worker_id >= $server->setting['worker_num']) {
$this->onTask($server, $annotation);
@@ -78,13 +78,13 @@ class OnWorkerStart extends Callback
*/
public function onTask(Server $server, Annotation $annotation)
{
putenv('environmental=' . Snowflake::TASK);
putenv('environmental=' . Kiri::TASK);
$annotation->runtime(APP_PATH, [CONTROLLER_PATH, TASK_PATH, LISTENER_PATH]);
name($server->worker_pid, 'Task#' . $server->worker_id);
Snowflake::setTaskId($server->worker_pid);
Kiri::setTaskId($server->worker_pid);
fire(Event::SERVER_TASK_START);
}
@@ -106,8 +106,8 @@ class OnWorkerStart extends Callback
$this->debug('use time.' . (microtime(true) - $time));
$annotation->runtime(directory('app'), [CONTROLLER_PATH]);
Snowflake::setWorkerId($server->worker_pid);
putenv('environmental=' . Snowflake::WORKER);
Kiri::setWorkerId($server->worker_pid);
putenv('environmental=' . Kiri::WORKER);
fire(Event::SERVER_WORKER_START, [getenv('worker')]);
}
HttpServer/Events/OnWorkerStop.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Timer;
/**