This commit is contained in:
2021-04-16 15:13:18 +08:00
parent cd41397f36
commit ba3009086d
+10 -5
View File
@@ -36,12 +36,11 @@ class OnWorkerStart extends Callback
$annotation = Snowflake::app()->getAnnotation(); $annotation = Snowflake::app()->getAnnotation();
$annotation->setLoader(unserialize($content)); $annotation->setLoader(unserialize($content));
$annotation->runtime(directory('app'));
if ($worker_id < $server->setting['worker_num']) { if ($worker_id < $server->setting['worker_num']) {
$this->onWorker($server); $this->onWorker($server, $annotation);
} else { } else {
$this->onTask($server); $this->onTask($server, $annotation);
} }
} }
@@ -59,13 +58,16 @@ class OnWorkerStart extends Callback
/** /**
* @param Server $server * @param Server $server
* @param Annotation $annotation
* @throws ConfigException * @throws ConfigException
* @throws Exception * @throws Exception
*/ */
public function onTask(Server $server) public function onTask(Server $server, Annotation $annotation)
{ {
putenv('environmental=' . Snowflake::TASK); putenv('environmental=' . Snowflake::TASK);
$annotation->runtime(directory('app'),CONTROLLER_PATH);
name($server->worker_pid, 'Task#' . $server->worker_id); name($server->worker_pid, 'Task#' . $server->worker_id);
Snowflake::setTaskId($server->worker_pid); Snowflake::setTaskId($server->worker_pid);
@@ -76,13 +78,16 @@ class OnWorkerStart extends Callback
/** /**
* @param Server $server * @param Server $server
* @param Annotation $annotation
* @throws Exception * @throws Exception
*/ */
public function onWorker(Server $server) public function onWorker(Server $server, Annotation $annotation)
{ {
try { try {
name($server->worker_pid, 'Worker#' . $server->worker_id); name($server->worker_pid, 'Worker#' . $server->worker_id);
$annotation->runtime(directory('app'));
Snowflake::setWorkerId($server->worker_pid); Snowflake::setWorkerId($server->worker_pid);
putenv('environmental=' . Snowflake::WORKER); putenv('environmental=' . Snowflake::WORKER);