This commit is contained in:
2021-08-03 11:00:18 +08:00
parent cb056899e6
commit 537cb2dcf3
+5 -9
View File
@@ -42,11 +42,6 @@ class ServerWorker extends \Server\Abstracts\Server
$this->runEvent(Constant::WORKER_START, null, [$server, $workerId]); $this->runEvent(Constant::WORKER_START, null, [$server, $workerId]);
putenv('environmental=' . Snowflake::WORKER);
if ($workerId >= $server->setting['worker_num']) {
putenv('environmental=' . Snowflake::TASK);
}
$this->workerInitExecutor($server, $annotation, $workerId); $this->workerInitExecutor($server, $annotation, $workerId);
$this->interpretDirectory($annotation); $this->interpretDirectory($annotation);
@@ -65,10 +60,7 @@ class ServerWorker extends \Server\Abstracts\Server
$fileLists = $annotation->runtime(APP_PATH . 'app'); $fileLists = $annotation->runtime(APP_PATH . 'app');
$di = Snowflake::getDi(); $di = Snowflake::getDi();
foreach ($fileLists as $file => $class) { foreach ($fileLists as $class) {
// if (Snowflake::isTask() && str_contains($file, CONTROLLER_PATH)) {
// continue;
// }
$instance = $di->get($class); $instance = $di->get($class);
$methods = $di->getMethodAttribute($class); $methods = $di->getMethodAttribute($class);
foreach ($methods as $method => $attribute) { foreach ($methods as $method => $attribute) {
@@ -96,9 +88,13 @@ class ServerWorker extends \Server\Abstracts\Server
$loader = Snowflake::app()->getRouter(); $loader = Snowflake::app()->getRouter();
$loader->_loader(); $loader->_loader();
putenv('environmental=' . Snowflake::WORKER);
echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL; echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL;
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId)); $this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
} else { } else {
putenv('environmental=' . Snowflake::TASK);
echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL; echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL;
$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId)); $this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));