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

update to 1.3.1 version

Browse Source 
fix DataProvider::setJsonData bug
add Root document of default request
⚠️ change MySQL driver to PDO, mysqlnd required
improve exception catcher
This commit is contained in:
whale
2020-05-10 14:11:32 +08:00
parent 81db9c6ccb
commit 886816e3d5
10 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ZM/Event/EventHandler.php
View File

@@ -63,7 +63,12 @@ class EventHandler
/** @var Server $param0 */
$conn = ConnectionManager::get($param1->fd);
set_coroutine_params(["server" => $param0, "frame" => $param1, "connection" => $conn]);
(new MessageEvent($param0, $param1))->onActivate()->onAfter();
try {
(new MessageEvent($param0, $param1))->onActivate()->onAfter();
} catch (Error $e) {
$error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
Console::error("Fatal error when calling $event_name: " . $error_msg);
}
break;
case "request":
try {
@@ -78,15 +83,37 @@ class EventHandler
if (!$param1->isEnd()) $param1->end("Internal server error: " . $e->getMessage());
Console::error("Internal server error (500), caused by uncaught exception.");
Console::log($e->getTraceAsString(), "gray");
} catch (Error $e) {
/** @var Response $param1 */
$param1->status(500);
Console::info($param0->server["remote_addr"] . ":" . $param0->server["remote_port"] .
" [" . $param1->getStatusCode() . "] " . $param0->server["request_uri"]
);
$doc = "Internal server error<br>";
$error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
if (ZMBuf::$atomics["info_level"]->get() >= 4) $doc .= $error_msg;
if (!$param1->isEnd()) $param1->end($doc);
Console::error("Internal server error (500): " . $error_msg);
Console::log($e->getTraceAsString(), "gray");
}
break;
case "open":
set_coroutine_params(["server" => $param0, "request" => $param1]);
(new WSOpenEvent($param0, $param1))->onActivate()->onAfter();
try {
(new WSOpenEvent($param0, $param1))->onActivate()->onAfter();
} catch (Error $e) {
$error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
Console::error("Fatal error when calling $event_name: " . $error_msg);
}
break;
case "close":
set_coroutine_params(["server" => $param0, "fd" => $param1]);
(new WSCloseEvent($param0, $param1))->onActivate()->onAfter();
try {
(new WSCloseEvent($param0, $param1))->onActivate()->onAfter();
} catch (Error $e) {
$error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
Console::error("Fatal error when calling $event_name: " . $error_msg);
}
break;
}
//Console::info(Console::setColor("Event: " . $event_name . " 运行了 " . round(microtime(true) - $starttime, 5) . " 秒", "gold"));

2
src/ZM/Event/Swoole/MessageEvent.php
View File

@@ -63,7 +63,7 @@ class MessageEvent implements SwooleEvent
}
}
} catch (Exception $e) {
Console::warning("Websocket message event exception: " . $e->getMessage());
Console::warning("Websocket message event exception: " . (($cs = $e->getMessage()) == "" ? get_class($e) : $cs));
}
return $this;
}

3
src/ZM/Event/Swoole/WorkerStartEvent.php
View File

@@ -133,6 +133,7 @@ class WorkerStartEvent implements SwooleEvent
//加载phar包
Console::info("加载外部phar包中");
$dir = DataProvider::getWorkingDir() . "/resources/package/";
if (version_compare(SWOOLE_VERSION, "4.4.0", ">=")) Timer::clearAll();
if (is_dir($dir)) {
$list = scandir($dir);
unset($list[0], $list[1]);
@@ -147,7 +148,7 @@ class WorkerStartEvent implements SwooleEvent
Console::info("加载composer资源中");
require_once DataProvider::getWorkingDir() . "/vendor/autoload.php";
} else {
if(isPharMode()) require_once WORKING_DIR . "/vendor/autoload.php";
if (isPharMode()) require_once WORKING_DIR . "/vendor/autoload.php";
}
//加载各个模块的注解类，以及反射