From 9284ce52dae8bd9308c839edb4a748c10e13fbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=9A=84=E5=A6=82=E6=9E=9C?= Date: Tue, 7 Mar 2023 11:08:59 +0800 Subject: [PATCH] =?UTF-8?q?spl=E4=BE=9D=E8=B5=962.x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core.php b/src/Core.php index a629df0..5188b44 100644 --- a/src/Core.php +++ b/src/Core.php @@ -356,7 +356,7 @@ private function extraHandler() $serverName = Config::getInstance()->getConf('SERVER_NAME').".{$mode}"; //注册Task进程 $config = Config::getInstance()->getConf('MAIN_SERVER.TASK'); - $config = TaskManager::getInstance()->getConfig()->merge($config); + $config = TaskManager::getInstance()->getConfig()->restore($config); $config->setTempDir(EASYSWOOLE_TEMP_DIR); $config->setServerName($serverName); $config->setOnException(function (\Throwable $throwable) {