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

update to 2.2.2 version finally

Browse Source 
clean redundant code
fix API reply in @OnTick for multi-process
fix loop error reporting
This commit is contained in:
jerry
2021-01-29 23:34:34 +08:00
parent 776ec98a3e
commit 61e3818563
15 changed files with 76 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ZM/Utils/CoMessage.php
View File

@@ -16,7 +16,7 @@ class CoMessage
* @param array $hang
* @param array $compare
* @param int $timeout
* @return bool
* @return mixed
* @throws Exception
*/
public static function yieldByWS(array $hang, array $compare, $timeout = 600) {
@@ -57,7 +57,8 @@ class CoMessage
foreach ($all as $k => $v) {
if(!isset($v["compare"])) continue;
foreach ($v["compare"] as $vs) {
if ($v[$vs] != ($dat[$vs] ?? null)) {
if (!isset($v[$vs], $dat[$vs])) continue 2;
if ($v[$vs] != $dat[$vs]) {
continue 2;
}
}
@@ -68,7 +69,7 @@ class CoMessage
LightCacheInside::set("wait_api", "wait_api", $all);
SpinLock::unlock("wait_api");
if ($all[$last]["worker_id"] != server()->worker_id) {
ZMUtil::sendActionToWorker($all[$k]["worker_id"], "resume_ws_message", $all[$last]);
ZMUtil::sendActionToWorker($all[$last]["worker_id"], "resume_ws_message", $all[$last]);
} else {
Co::resume($all[$last]["coroutine"]);
}