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])) {