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

update to 1.4.1 version

Browse Source 
fix uncaught PDOException
This commit is contained in:
whale
2020-05-31 14:22:39 +08:00
parent 8ae5844649
commit a8183757be
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -3,7 +3,7 @@
"description": "high-performance intelligent assistant", "description": "high-performance intelligent assistant",
"minimum-stability": "stable", "minimum-stability": "stable",
"license": "Apache-2.0", "license": "Apache-2.0",
"version": "1.4.0", "version": "1.4.1",
"authors": [ "authors": [
{ {
"name": "whale", "name": "whale",

18
src/ZM/DB/DB.php
View File

@@ -7,6 +7,7 @@ namespace ZM\DB;
use Exception; use Exception;
use framework\Console; use framework\Console;
use framework\ZMBuf; use framework\ZMBuf;
use PDOException;
use PDOStatement; use PDOStatement;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Database\PDOStatementProxy; use Swoole\Database\PDOStatementProxy;
@@ -132,7 +133,7 @@ class DB
} }
return $ps->fetchAll(); return $ps->fetchAll();
} }
} catch (DBException $e) { } catch (DbException $e) {
if (ZMBuf::get("sql_log") === true) { if (ZMBuf::get("sql_log") === true) {
$log = $log =
"[" . date("Y-m-d H:i:s") . "[" . date("Y-m-d H:i:s") .
@@ -147,6 +148,21 @@ class DB
} }
Console::warning($e->getMessage()); Console::warning($e->getMessage());
throw $e; throw $e;
} catch (PDOException $e) {
if (ZMBuf::get("sql_log") === true) {
$log =
"[" . date("Y-m-d H:i:s") .
" " . round(microtime(true) - $starttime, 4) .
"] " . $line . " " . json_encode($params, JSON_UNESCAPED_UNICODE) . " (Error:" . $e->getMessage() . ")\n";
Coroutine::writeFile(CRASH_DIR . "sql.log", $log, FILE_APPEND);
}
if(mb_strpos($e->getMessage(), "has gone away") !== false) {
zm_sleep(0.2);
Console::warning("Gone away of MySQL! retrying!");
return self::rawQuery($line, $params);
}
Console::warning($e->getMessage());
throw new DbException($e->getMessage(), $e->getCode(), $e);
} }
} }