zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-25 01:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 2.5.0-b3 (build 412)

Browse Source
This commit is contained in:
crazywhalecc
2021-07-09 01:43:39 +08:00
parent 48215f2e5e
commit 58267f66fc
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/ConsoleApplication.php
View File

@@ -28,7 +28,7 @@ class ConsoleApplication extends Application
{ {
private static $obj = null; private static $obj = null;
const VERSION_ID = 411; const VERSION_ID = 412;
const VERSION = "2.5.0-b3"; const VERSION = "2.5.0-b3";
/** /**

1
src/ZM/Event/SwooleEvent/OnManagerStart.php
View File

@@ -37,7 +37,6 @@ class OnManagerStart implements SwooleEvent
SignalListener::signalManager(); SignalListener::signalManager();
} }
self::$process = new Process(function() { self::$process = new Process(function() {
swoole_set_process_name($_SERVER["_"]." {ext-proc}");
if (Framework::$argv["watch"]) { if (Framework::$argv["watch"]) {
if (extension_loaded('inotify')) { if (extension_loaded('inotify')) {
Console::info("Enabled File watcher, framework will reload automatically."); Console::info("Enabled File watcher, framework will reload automatically.");

4
src/ZM/Framework.php
View File

@@ -113,7 +113,7 @@ class Framework
// 打印初始信息 // 打印初始信息
$out["listen"] = ZMConfig::get("global", "host") . ":" . ZMConfig::get("global", "port"); $out["listen"] = ZMConfig::get("global", "host") . ":" . ZMConfig::get("global", "port");
if (!isset($this->server_set["worker_num"])) { 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)"; $out["worker"] = swoole_cpu_num() . " (auto)";
} else { } else {
$out["single_proc_mode"] = "true"; $out["single_proc_mode"] = "true";
@@ -136,7 +136,7 @@ class Framework
$conf = ZMConfig::get("global", "sql_config"); $conf = ZMConfig::get("global", "sql_config");
$out["mysql_pool"] = $conf["sql_database"] . "@" . $conf["sql_host"] . ":" . $conf["sql_port"]; $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"); $conf = ZMConfig::get("global", "mysql_config");
$out["mysql"] = $conf["dbname"] . "@" . $conf["host"] . ":" . $conf["port"]; $out["mysql"] = $conf["dbname"] . "@" . $conf["host"] . ":" . $conf["port"];
} }