eee

Abstracts/AsyncServer.php

@@ -92,7 +92,7 @@ class AsyncServer extends Component implements ServerInterface
             $config->events[Constant::SHUTDOWN] = [OnServer::class, 'onShutdown'];
         }
 
-        $this->event($this->server, array_merge(\config('server.events', []), $config->events));
+        $this->event($this->server, array_merge(\config('servers.server.events', []), $config->events));
         $this->container->bind(ServerInterface::class, $this->server);
         return $service;
     }
@@ -106,7 +106,7 @@ class AsyncServer extends Component implements ServerInterface
      */
     protected function systemConfig(SConfig $config, int $daemon): array
     {
-        $settings                                     = array_merge(\config('server.settings', []), $config->settings);
+        $settings                                     = array_merge(\config('servers.server.settings', []), $config->settings);
         $settings[Constant::OPTION_DAEMONIZE]         = (bool)$daemon;
         $settings[Constant::OPTION_ENABLE_REUSE_PORT] = true;
         $settings[Constant::OPTION_PID_FILE]          = storage('.swoole.pid');

Abstracts/HotReload.php

@@ -113,7 +113,7 @@ class HotReload extends AbstractProcess
         }
         $this->reloading = true;
 
-        di(StdoutLogger::class)->println('reloading server[' . \config('id', 'system-service') . '], please waite.');
+        di(StdoutLogger::class)->println('reloading server[' . \config('site.id', 'system-service') . '], please waite.');
 
         $this->clear();
         di(ServerInterface::class)->reload();
@@ -128,7 +128,7 @@ class HotReload extends AbstractProcess
      */
     protected function addListen(): void
     {
-        foreach (config('reload.listen') as $value) {
+        foreach (config('servers.reload.listen') as $value) {
             $this->readDirectory($value);
         }
     }
@@ -168,4 +168,4 @@ class HotReload extends AbstractProcess
             }
         }
     }
-}
+}

Abstracts/TraitServer.php

@@ -21,7 +21,7 @@ trait TraitServer
      */
     public function onSignal(): void
     {
-        $signal = \config('signal', []);
+        $signal = \config('servers.signal', []);
         $this->onPcntlSignal(SIGINT, [$this, 'onSigint']);
         foreach ($signal as $sig => $value) {
             if (is_array($value) && is_string($value[0])) {

Processes/TraitProcess.php

@@ -40,7 +40,7 @@ trait TraitProcess
     private function genProcess(AbstractProcess $name): Process
     {
         return new Process(function (Process $process) use ($name) {
-            $process->name('[' . \config('id', 'system-service') . '].' . $name->getName() . '[' . $process->pid . ']');
+            $process->name('[' . \config('site.id', 'system-service') . '].' . $name->getName() . '[' . $process->pid . ']');
             $name->onShutdown($process)->process($process);
         },
             $name->getRedirectStdinAndStdout(),
@@ -66,4 +66,4 @@ trait TraitProcess
     {
         return $this->_process;
     }
-}
+}

ServerCommand.php

@@ -114,7 +114,7 @@ class ServerCommand extends Command
      */
     protected function stop(): int
     {
-        $configs   = config('server', []);
+        $configs   = config('servers.server', []);
         $instances = $this->asyncServer->sortService($configs['ports'] ?? []);
         foreach ($instances as $config) {
             $this->state->exit($config->port);
@@ -131,13 +131,13 @@ class ServerCommand extends Command
      */
     protected function start(InputInterface $input): int
     {
-        $this->asyncServer->addProcess(config('processes', []));
-        if (\config('reload.hot', false) === true) {
+        $this->asyncServer->addProcess(config('process', []));
+        if (\config('servers.reload.hot', false) === true) {
             $this->asyncServer->addProcess([HotReload::class]);
         } else {
             di(Router::class)->scan_build_route();
         }
-        $this->asyncServer->initCoreServers(config('server', []), (int)$input->getOption('daemon'));
+        $this->asyncServer->initCoreServers(config('servers.server', []), (int)$input->getOption('daemon'));
         $this->asyncServer->start();
         return 1;
     }

State.php

@@ -21,7 +21,7 @@ class State extends Component
      */
     public function init(): void
     {
-        $this->servers = config('server.ports');
+        $this->servers = config('servers.server.ports');
     }
 
 

Task/Task.php

@@ -24,7 +24,7 @@ class Task
      */
     public function __construct()
     {
-        $exception = \config('exception.task');
+        $exception = \config('servers.task.exception');
         if (!in_array(ExceptionHandlerInterface::class, class_implements($exception))) {
             $exception = ExceptionHandlerDispatcher::class;
         }