111

http-server/Worker/OnServerWorker.php

@@ -14,6 +14,7 @@ use Server\Events\OnWorkerError;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStart;
 use Server\Events\OnWorkerStop;
+use Server\ServerManager;
 use Swoole\Server;
 use Swoole\Timer;
 
@@ -54,8 +55,7 @@ class OnServerWorker extends \Server\Abstracts\Server
      */
     public function setConfigure(OnBeforeWorkerStart $worker)
     {
-        putenv('state=start');
-        putenv('worker=' . $worker->workerId);
+        ServerManager::setEnv('worker', $worker->workerId);
         $serialize = file_get_contents(storage(Runtime::CONFIG_NAME));
         if (!empty($serialize)) {
             Config::sets(unserialize($serialize));
@@ -83,7 +83,7 @@ class OnServerWorker extends \Server\Abstracts\Server
      */
     public function onWorkerExit(Server $server, int $workerId)
     {
-        putenv('state=exit');
+        ServerManager::setEnv('state', 'exit');
 
         $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
     }
@@ -104,7 +104,8 @@ class OnServerWorker extends \Server\Abstracts\Server
         $message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
             $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
         );
-        write($message, 'worker-exit');
+
+        $this->logger->error($message);
 
         $this->system_mail($message);
     }

http-server/Worker/OnWorkerStart.php

@@ -12,6 +12,7 @@ use Kiri\Kiri;
 use Kiri\Runtime;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use ReflectionException;
+use Server\ServerManager;
 
 class OnWorkerStart implements EventDispatcherInterface
 {
@@ -35,17 +36,17 @@ class OnWorkerStart implements EventDispatcherInterface
     {
         $isWorker = $event->workerId < $event->server->setting['worker_num'];
 
-        $this->annotation->read(APP_PATH . 'app','App', $isWorker ? [] : [CONTROLLER_PATH]);
+        $this->annotation->read(APP_PATH . 'app', 'App', $isWorker ? [] : [CONTROLLER_PATH]);
         $this->interpretDirectory();
         if ($isWorker) {
-            putenv('environmental=' . Kiri::WORKER);
+            ServerManager::setEnv('environmental', Kiri::WORKER);
             Kiri::getFactory()->getRouter()->_loader();
 
             echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;
 
             $this->setProcessName(sprintf('Worker[%d].%d', $event->server->worker_pid, $event->workerId));
         } else {
-            putenv('environmental=' . Kiri::TASK);
+            ServerManager::setEnv('environmental', Kiri::TASK);
 
             echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;