From 58267f66fc698a78bad4079c3f44d75fc242b7b4 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Fri, 9 Jul 2021 01:43:39 +0800 Subject: [PATCH] update to 2.5.0-b3 (build 412) --- src/ZM/ConsoleApplication.php | 2 +- src/ZM/Event/SwooleEvent/OnManagerStart.php | 1 - src/ZM/Framework.php | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ZM/ConsoleApplication.php b/src/ZM/ConsoleApplication.php index 55232bb4..ff4cb74e 100644 --- a/src/ZM/ConsoleApplication.php +++ b/src/ZM/ConsoleApplication.php @@ -28,7 +28,7 @@ class ConsoleApplication extends Application { private static $obj = null; - const VERSION_ID = 411; + const VERSION_ID = 412; const VERSION = "2.5.0-b3"; /** diff --git a/src/ZM/Event/SwooleEvent/OnManagerStart.php b/src/ZM/Event/SwooleEvent/OnManagerStart.php index 923690cc..2e5fd42c 100644 --- a/src/ZM/Event/SwooleEvent/OnManagerStart.php +++ b/src/ZM/Event/SwooleEvent/OnManagerStart.php @@ -37,7 +37,6 @@ class OnManagerStart implements SwooleEvent SignalListener::signalManager(); } self::$process = new Process(function() { - swoole_set_process_name($_SERVER["_"]." {ext-proc}"); if (Framework::$argv["watch"]) { if (extension_loaded('inotify')) { Console::info("Enabled File watcher, framework will reload automatically."); diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php index 9c6125f5..73d0421e 100644 --- a/src/ZM/Framework.php +++ b/src/ZM/Framework.php @@ -113,7 +113,7 @@ class Framework // 打印初始信息 $out["listen"] = ZMConfig::get("global", "host") . ":" . ZMConfig::get("global", "port"); if (!isset($this->server_set["worker_num"])) { - if ((ZMConfig::get("global", "runtime")["swoole_server_mode"]) == SWOOLE_PROCESS) { + if ((ZMConfig::get("global", "runtime")["swoole_server_mode"] ?? SWOOLE_PROCESS) == SWOOLE_PROCESS) { $out["worker"] = swoole_cpu_num() . " (auto)"; } else { $out["single_proc_mode"] = "true"; @@ -136,7 +136,7 @@ class Framework $conf = ZMConfig::get("global", "sql_config"); $out["mysql_pool"] = $conf["sql_database"] . "@" . $conf["sql_host"] . ":" . $conf["sql_port"]; } - if (ZMConfig::get("global", "mysql_config")["host"] !== "") { + if ((ZMConfig::get("global", "mysql_config")["host"] ?? null) !== "") { $conf = ZMConfig::get("global", "mysql_config"); $out["mysql"] = $conf["dbname"] . "@" . $conf["host"] . ":" . $conf["port"]; }