diff --git a/HttpServer/Server.php b/HttpServer/Server.php index 97eefce3..81468979 100644 --- a/HttpServer/Server.php +++ b/HttpServer/Server.php @@ -251,6 +251,9 @@ class Server extends Application if (!($this->baseServer instanceof \Swoole\Server)) { $class = $this->dispatch($config['type']); $this->baseServer = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']); + if (!isset($settings['pid_file'])) { + $settings['pid_file'] = APP_PATH . 'storage/server.pid'; + } $this->baseServer->set($settings); $this->bindAnnotation(); } else { diff --git a/function.php b/function.php index 2de321d8..0b9e3210 100644 --- a/function.php +++ b/function.php @@ -158,11 +158,11 @@ if (!function_exists('storage')) { { $basePath = Snowflake::getStoragePath(); if (empty($path)) { - $fileName = $basePath . '/' . $fileName; + $fileName = rtrim($basePath, '/') . '/' . $fileName; } else if (empty($fileName)) { - $fileName = initDir($basePath, $path); + $fileName = rtrim(initDir($basePath, $path)); } else { - $fileName = initDir($basePath, $path) . '/' . $fileName; + $fileName = rtrim(initDir($basePath, $path)) . '/' . $fileName; } if (!file_exists($fileName)) { touch($fileName); @@ -301,7 +301,6 @@ if (!function_exists('merge')) { } - if (!function_exists('jTraceEx')) { /**