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

update to 2.4.1 version (build 401)

Browse Source 
fix startup warning bug
This commit is contained in:
jerry
2021-03-25 17:11:35 +08:00
parent 600829645d
commit bbe4addd83
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/update/v2.md
View File

@@ -1,5 +1,11 @@
# 更新日志（v2 版本） # 更新日志（v2 版本）
## v2.4.1 (build 401)
> 更新时间：2021.3.25
- 修复：开启框架时导致的报错
## v2.4.0（build 400） ## v2.4.0（build 400）
> 更新时间：2021.3.25 > 更新时间：2021.3.25

4
src/ZM/ConsoleApplication.php
View File

@@ -20,8 +20,8 @@ use ZM\Utils\DataProvider;
class ConsoleApplication extends Application class ConsoleApplication extends Application
{ {
const VERSION_ID = 400; const VERSION_ID = 401;
const VERSION = "2.4.0"; const VERSION = "2.4.1";
public function __construct(string $name = 'UNKNOWN') { public function __construct(string $name = 'UNKNOWN') {
define("ZM_VERSION_ID", self::VERSION_ID); define("ZM_VERSION_ID", self::VERSION_ID);

22
src/ZM/Framework.php
View File

@@ -340,18 +340,22 @@ class Framework
foreach ($args as $x => $y) { foreach ($args as $x => $y) {
switch ($x) { switch ($x) {
case 'worker-num': case 'worker-num':
if (intval($y) >= 1 && intval($y) <= 1024) { if ($y) {
$this->server_set["worker_num"] = intval($y); if (intval($y) >= 1 && intval($y) <= 1024) {
} else { $this->server_set["worker_num"] = intval($y);
Console::warning("Invalid worker num! Turn to default value (".($this->server_set["worker_num"] ?? swoole_cpu_num()).")"); } else {
Console::warning("Invalid worker num! Turn to default value (".($this->server_set["worker_num"] ?? swoole_cpu_num()).")");
}
} }
break; break;
case 'task-worker-num': case 'task-worker-num':
if (intval($y) >= 1 && intval($y) <= 1024) { if ($y) {
$this->server_set["task_worker_num"] = intval($y); if (intval($y) >= 1 && intval($y) <= 1024) {
$this->server_set["task_enable_coroutine"] = true; $this->server_set["task_worker_num"] = intval($y);
} else { $this->server_set["task_enable_coroutine"] = true;
Console::warning("Invalid worker num! Turn to default value (0)"); } else {
Console::warning("Invalid worker num! Turn to default value (0)");
}
} }
break; break;
case 'disable-coroutine': case 'disable-coroutine':

1
src/ZM/Store/ZMAtomic.php
View File

@@ -35,7 +35,6 @@ class ZMAtomic
for($i = 0; $i < ZM_WORKER_NUM; ++$i) { for($i = 0; $i < ZM_WORKER_NUM; ++$i) {
self::$atomics["_#worker_".$i] = new Atomic(0); self::$atomics["_#worker_".$i] = new Atomic(0);
} }
echo ("初始化工作进程数量：".ZM_WORKER_NUM.PHP_EOL);
for ($i = 0; $i < 10; ++$i) { for ($i = 0; $i < 10; ++$i) {
self::$atomics["_tmp_" . $i] = new Atomic(0); self::$atomics["_tmp_" . $i] = new Atomic(0);
} }