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

代码格式调整

Browse Source
This commit is contained in:
麦当苗儿
2013-04-17 11:33:39 +08:00
parent 20b9354b9b
commit f203a905b7
1 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Think/Error.php
View File

@@ -21,7 +21,7 @@ class Error {
$error = []; $error = [];
$error['message'] = $e->getMessage(); $error['message'] = $e->getMessage();
$trace = $e->getTrace(); $trace = $e->getTrace();
if('E'==$trace[0]['function']) { if('E' == $trace[0]['function']) {
$error['file'] = $trace[0]['file']; $error['file'] = $trace[0]['file'];
$error['line'] = $trace[0]['line']; $error['line'] = $trace[0]['line'];
}else{ }else{
@@ -42,22 +42,21 @@ class Error {
* @return void * @return void
*/ */
static public function appError($errno, $errstr, $errfile, $errline) { static public function appError($errno, $errstr, $errfile, $errline) {
$errorStr = "[{$errno}] {$errstr} {$errfile} 第 {$errline} 行.";
switch ($errno) { switch ($errno) {
case E_ERROR: case E_ERROR:
case E_PARSE: case E_PARSE:
case E_CORE_ERROR: case E_CORE_ERROR:
case E_COMPILE_ERROR: case E_COMPILE_ERROR:
case E_USER_ERROR: case E_USER_ERROR:
$errorStr = "[$errno] $errstr ".$errfile." 第 $errline 行."; Log::record($errorStr, 'ERROR');
Log::record($errorStr,'ERROR');
self::halt($errorStr); self::halt($errorStr);
break; break;
case E_STRICT: case E_STRICT:
case E_USER_WARNING: case E_USER_WARNING:
case E_USER_NOTICE: case E_USER_NOTICE:
default: default:
$errorStr = "[$errno] $errstr ".$errfile." 第 $errline 行."; Log::record($errorStr, 'NOTIC');
Log::record($errorStr,'NOTIC');
break; break;
} }
} }
@@ -81,9 +80,7 @@ class Error {
* @return void * @return void
*/ */
static public function halt($error) { static public function halt($error) {
if(IS_CLI) { IS_CLI && exit(is_array($error)?$error['message']:$error);
exit(is_array($error)?$error['message']:$error);
}
$e = []; $e = [];
if (Config::get('app_debug')) { if (Config::get('app_debug')) {
//调试模式下输出错误信息 //调试模式下输出错误信息