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-04-09 03:19:03 +08:00
parent 61a254a24e
commit 554386ec6f
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnWorkerStart.php
+15 -23
View File
@@ -18,24 +18,6 @@ use Swoole\Server;
class OnWorkerStart extends Callback class OnWorkerStart extends Callback
{ {
/**
* @throws Exception
*/
public function injectLoader($isWorker = false)
{
$runtime = file_get_contents(storage('runtime.php'));
$annotation = Snowflake::app()->getAnnotation();
$annotation->setLoader(unserialize($runtime));
if ($isWorker === true) {
$annotation->runtime(CONTROLLER_PATH);
$annotation->runtime(APP_PATH, CONTROLLER_PATH);
} else {
$annotation->runtime(MODEL_PATH);
}
return $isWorker;
}
/** /**
* @param Server $server * @param Server $server
* @param int $worker_id * @param int $worker_id
@@ -48,9 +30,14 @@ class OnWorkerStart extends Callback
putenv('state=start'); putenv('state=start');
putenv('worker=' . $worker_id); putenv('worker=' . $worker_id);
$isWorker = $this->injectLoader($this->isWorker($server, $worker_id)); $annotation = Snowflake::app()->getAnnotation();
$annotation->setLoader(unserialize(file_get_contents(storage('runtime.php'))));
$this->{$isWorker ? 'onWorker' : 'onTask'}($server); if ($worker_id < $server->setting['worker_num']) {
$this->onWorker($server, $annotation);
} else {
$this->onTask($server, $annotation);
}
} }
@@ -70,8 +57,10 @@ class OnWorkerStart extends Callback
* @param int $worker_id * @param int $worker_id
* @throws Exception * @throws Exception
*/ */
public function onTask(Server $server) public function onTask(Server $server, Annotation $annotation)
{ {
$annotation->runtime(MODEL_PATH);
putenv('environmental=' . Snowflake::TASK); putenv('environmental=' . Snowflake::TASK);
Snowflake::setTaskId($server->worker_pid); Snowflake::setTaskId($server->worker_pid);
@@ -85,12 +74,15 @@ class OnWorkerStart extends Callback
* @param int $worker_id * @param int $worker_id
* @throws Exception * @throws Exception
*/ */
public function onWorker(Server $server) public function onWorker(Server $server, Annotation $annotation)
{ {
try {
$annotation->runtime(CONTROLLER_PATH);
$annotation->runtime(APP_PATH, CONTROLLER_PATH);
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
putenv('environmental=' . Snowflake::WORKER); putenv('environmental=' . Snowflake::WORKER);
try {
fire(Event::SERVER_WORKER_START, [getenv('worker')]); fire(Event::SERVER_WORKER_START, [getenv('worker')]);
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
$this->addError($exception, 'throwable'); $this->addError($exception, 'throwable');