mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进部署模式下异常日志记录详细错误信息

Browse Source
This commit is contained in:
thinkphp
2016-03-14 22:25:56 +08:00
parent d27c6d3bbd
commit e2333b97db
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Error.php
View File

@@ -70,7 +70,7 @@ class Error
// 部署模式仅显示 Code 和 Message // 部署模式仅显示 Code 和 Message
$data = [ $data = [
'code' => $exception->getCode(), 'code' => $exception->getCode(),
'message' => Config::get('show_error_msg') ? $exception->getMessage() : Config::get('error_message'), 'message' => $exception->getMessage(),
]; ];
$log = "[{$data['code']}]{$data['message']}"; $log = "[{$data['code']}]{$data['message']}";
} }
@@ -136,15 +136,18 @@ class Error
/** /**
* 输出异常信息 * 输出异常信息
* @param \Exception $exception * @param \Exception $exception
* @param Array $vars 异常信息 * @param array $data 异常信息
* @return void * @return void
*/ */
public static function output($exception, array $vars) public static function output($exception, array $data)
{ {
http_response_code($exception instanceof Exception ? $exception->getHttpStatus() : 500); http_response_code($exception instanceof Exception ? $exception->getHttpStatus() : 500);
$type = Config::get('default_return_type'); $type = Config::get('default_return_type');
if (!APP_DEBUG) {
// 部署模式不显示详细错误信息
$data['message'] = Config::get('show_error_msg');
}
if (IS_API && 'html' != $type) { if (IS_API && 'html' != $type) {
// 异常信息输出监听 // 异常信息输出监听
APP_HOOK && Hook::listen('error_output', $data); APP_HOOK && Hook::listen('error_output', $data);
@@ -152,7 +155,7 @@ class Error
Response::send($data, $type, Config::get('response_return')); Response::send($data, $type, Config::get('response_return'));
} else { } else {
//ob_end_clean(); //ob_end_clean();
extract($vars); extract($data);
include Config::get('exception_tmpl'); include Config::get('exception_tmpl');
} }
} }