From bbe4addd83f7409e000a66eb6424aed62d25455b Mon Sep 17 00:00:00 2001 From: jerry Date: Thu, 25 Mar 2021 17:11:35 +0800 Subject: [PATCH] update to 2.4.1 version (build 401) fix startup warning bug --- docs/update/v2.md | 6 ++++++ src/ZM/ConsoleApplication.php | 4 ++-- src/ZM/Framework.php | 22 +++++++++++++--------- src/ZM/Store/ZMAtomic.php | 1 - 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/docs/update/v2.md b/docs/update/v2.md index 50772c39..b0b5997e 100644 --- a/docs/update/v2.md +++ b/docs/update/v2.md @@ -1,5 +1,11 @@ # 更新日志(v2 版本) +## v2.4.1 (build 401) + +> 更新时间:2021.3.25 + +- 修复:开启框架时导致的报错 + ## v2.4.0(build 400) > 更新时间:2021.3.25 diff --git a/src/ZM/ConsoleApplication.php b/src/ZM/ConsoleApplication.php index b1c1a729..7f59168c 100644 --- a/src/ZM/ConsoleApplication.php +++ b/src/ZM/ConsoleApplication.php @@ -20,8 +20,8 @@ use ZM\Utils\DataProvider; class ConsoleApplication extends Application { - const VERSION_ID = 400; - const VERSION = "2.4.0"; + const VERSION_ID = 401; + const VERSION = "2.4.1"; public function __construct(string $name = 'UNKNOWN') { define("ZM_VERSION_ID", self::VERSION_ID); diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php index 5e478345..218e52ca 100644 --- a/src/ZM/Framework.php +++ b/src/ZM/Framework.php @@ -340,18 +340,22 @@ class Framework foreach ($args as $x => $y) { switch ($x) { case 'worker-num': - if (intval($y) >= 1 && intval($y) <= 1024) { - $this->server_set["worker_num"] = intval($y); - } else { - Console::warning("Invalid worker num! Turn to default value (".($this->server_set["worker_num"] ?? swoole_cpu_num()).")"); + if ($y) { + if (intval($y) >= 1 && intval($y) <= 1024) { + $this->server_set["worker_num"] = intval($y); + } else { + Console::warning("Invalid worker num! Turn to default value (".($this->server_set["worker_num"] ?? swoole_cpu_num()).")"); + } } break; case 'task-worker-num': - if (intval($y) >= 1 && intval($y) <= 1024) { - $this->server_set["task_worker_num"] = intval($y); - $this->server_set["task_enable_coroutine"] = true; - } else { - Console::warning("Invalid worker num! Turn to default value (0)"); + if ($y) { + if (intval($y) >= 1 && intval($y) <= 1024) { + $this->server_set["task_worker_num"] = intval($y); + $this->server_set["task_enable_coroutine"] = true; + } else { + Console::warning("Invalid worker num! Turn to default value (0)"); + } } break; case 'disable-coroutine': diff --git a/src/ZM/Store/ZMAtomic.php b/src/ZM/Store/ZMAtomic.php index 9955f9f8..c1c8bed3 100644 --- a/src/ZM/Store/ZMAtomic.php +++ b/src/ZM/Store/ZMAtomic.php @@ -35,7 +35,6 @@ class ZMAtomic for($i = 0; $i < ZM_WORKER_NUM; ++$i) { self::$atomics["_#worker_".$i] = new Atomic(0); } - echo ("初始化工作进程数量:".ZM_WORKER_NUM.PHP_EOL); for ($i = 0; $i < 10; ++$i) { self::$atomics["_tmp_" . $i] = new Atomic(0); }