mirrors/buildadmin
1
0
Fork 0
mirror of https://gitee.com/wonderful-code/buildadmin synced 2024-11-23 07:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:收集异常数据时可能出现循环引用导致难以排查

Browse Source
This commit is contained in:
妙码生花 2024-03-15 12:18:22 +08:00
parent 44a8ac865a
commit cc5a7d5b9b
1 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
app/ExceptionHandle.php
View File

@ -9,6 +9,7 @@ use think\exception\HttpException;
use think\exception\HttpResponseException;
use think\exception\ValidateException;
use think\Response;
use think\Request;
use Throwable;
/**
@ -45,15 +46,74 @@ class ExceptionHandle extends Handle
* Render an exception into an HTTP response.
*
* @access public
* @param \think\Request $request
* @param Throwable $e
* @param Request $request
* @param Throwable $e
* @return Response
*/
public function render($request, Throwable $e): Response
public function render(Request $request, Throwable $e): Response
{
// 添加自定义异常处理机制
// 其他错误交给系统处理
return parent::render($request, $e);
}
/**
* 收集异常数据
*/
protected function convertExceptionToArray(Throwable $exception): array
{
if ($this->app->isDebug()) {
// 调试模式，获取详细的错误信息
$traces = [];
$nextException = $exception;
do {
$traces[] = [
'name' => $nextException::class,
'file' => $nextException->getFile(),
'line' => $nextException->getLine(),
'code' => $this->getCode($nextException),
'message' => $this->getMessage($nextException),
'trace' => $nextException->getTrace(),
'source' => $this->getSourceCode($nextException),
];
} while ($nextException = $nextException->getPrevious());
// 循环引用检测并直接置空 traces（比起循环引用导致的报错，置空后开发者能得到更多真实的错误信息）
if ($this->app->request->isJson()) {
$json = json_encode($traces, JSON_UNESCAPED_UNICODE);
if (false === $json && in_array(json_last_error(), [JSON_ERROR_DEPTH, JSON_ERROR_RECURSION])) {
$traces = [];
}
}
$data = [
'code' => $this->getCode($exception),
'message' => $this->getMessage($exception),
'traces' => $traces,
'datas' => $this->getExtendData($exception),
'tables' => [
'GET Data' => $this->app->request->get(),
'POST Data' => $this->app->request->post(),
'Files' => $this->app->request->file(),
'Cookies' => $this->app->request->cookie(),
'Session' => $this->app->exists('session') ? $this->app->session->all() : [],
'Server/Request Data' => $this->app->request->server(),
],
];
} else {
// 部署模式仅显示 Code 和 Message
$data = [
'code' => $this->getCode($exception),
'message' => $this->getMessage($exception),
];
if (!$this->app->config->get('app.show_error_msg')) {
// 不显示详细错误信息
$data['message'] = $this->app->config->get('app.error_message');
}
}
return $data;
}
}