fix produce load bug

easy-swoole · Jan 29, 2019 · c1a6890 · c1a6890
1 parent dc139ee
commit c1a6890
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/Command/CommandRunner.php b/src/Command/CommandRunner.php
@@ -38,6 +38,10 @@ function run(array $args):?string
         if(empty($command)){
             $command = 'help';
         }else if($command != 'install'){
+            //预先加载配置
+            if(in_array('produce',$args)){
+                Core::getInstance()->setIsDev(false);
+            }
             Core::getInstance()->initialize();
         }
         if(!CommandContainer::getInstance()->get($command)){

diff --git a/src/Command/DefaultCommand/Start.php b/src/Command/DefaultCommand/Start.php
@@ -31,9 +31,8 @@ public function exec(array $args): ?string
         Utility::opCacheClear();
         $response = Utility::easySwooleLog();
         $mode = 'develop';
-        if(in_array('produce',$args)){
+        if(!Core::getInstance()->isDev()){
             $mode = 'produce';
-            Core::getInstance()->setIsDev(false);
         }
         $conf = Config::getInstance();
         if(in_array("d",$args) || in_array("daemonize",$args)){

diff --git a/src/Core.php b/src/Core.php
@@ -72,8 +72,6 @@ function __construct()
     function setIsDev(bool $isDev)
     {
         $this->isDev = $isDev;
-        //变更这里的时候，例如在全局的事件里面修改的，，重新加载配置项
-        $this->loadEnv();
         return $this;
     }
 
@@ -154,6 +152,8 @@ private function sysDirectoryInit():void
         if(empty($tempDir)){
             $tempDir = EASYSWOOLE_ROOT.'/Temp';
             Config::getInstance()->setConf('TEMP_DIR',$tempDir);
+        }else{
+            $tempDir = rtrim($tempDir,'/');
         }
         if(!is_dir($tempDir)){
             mkdir($tempDir);
@@ -164,6 +164,8 @@ private function sysDirectoryInit():void
         if(empty($logDir)){
             $logDir = EASYSWOOLE_ROOT.'/Log';
             Config::getInstance()->setConf('LOG_DIR',$logDir);
+        }else{
+            $logDir = rtrim($logDir,'/');
         }
         if(!is_dir($logDir)){
             mkdir($logDir);
@@ -400,7 +402,7 @@ private function registerDefaultCallBack(\swoole_server $server,int $serverType)
         });
     }
 
-    private function loadEnv()
+    public function loadEnv()
     {
         //加载之前，先清空原来的
         if($this->isDev){