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:
thinkphp
2016-06-14 22:52:15 +08:00
parent 5ce406abd2
commit 3d989e6f2c
2 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/log/driver/Browser.php
View File

@@ -8,12 +8,15 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: yangweijie <yangweijiester@gmail.com> // | Author: yangweijie <yangweijiester@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace think\log\driver; namespace think\log\driver;
use think\Cache; use think\Cache;
use think\Config; use think\Config;
use think\Db; use think\Db;
use think\Debug; use think\Debug;
use think\Request; use think\Request;
/** /**
* 浏览器调试输出 * 浏览器调试输出
*/ */
@@ -64,14 +67,6 @@ class Browser
$info = Debug::getFile(true); $info = Debug::getFile(true);
// 获取调试日志
$debug = [];
foreach ($log as $type => $val) {
foreach ($val as $msg) {
$debug[$type][] = $msg;
}
}
// 页面Trace信息 // 页面Trace信息
$trace = []; $trace = [];
foreach ($this->config['trace_tabs'] as $name => $title) { foreach ($this->config['trace_tabs'] as $name => $title) {
@@ -89,11 +84,11 @@ class Browser
$names = explode('|', $name); $names = explode('|', $name);
$result = []; $result = [];
foreach ($names as $name) { foreach ($names as $name) {
$result = array_merge($result, isset($debug[$name]) ? $debug[$name] : []); $result = array_merge($result, isset($log[$name]) ? $log[$name] : []);
} }
$trace[$title] = $result; $trace[$title] = $result;
} else { } else {
$trace[$title] = isset($debug[$name]) ? $debug[$name] : ''; $trace[$title] = isset($log[$name]) ? $log[$name] : '';
} }
} }
} }
@@ -120,8 +115,9 @@ JS;
$line[] = ($type == $trace_tabs[0] || '调试' == $type || '错误'== $type)? $line[] = ($type == $trace_tabs[0] || '调试' == $type || '错误'== $type)?
"console.group('{$type}');" "console.group('{$type}');"
: :
"console.groupCollapsed('{$type}');"; "console.groupCollapsed('{$type}');";//dump($msg);
foreach ($msg as $key => $m) {
foreach ((array)$msg as $key => $m) {
switch ($type) { switch ($type) {
case '调试': case '调试':
$var_type = gettype($m); $var_type = gettype($m);
@@ -135,7 +131,6 @@ JS;
$msg = str_replace(PHP_EOL, '\n', $m); $msg = str_replace(PHP_EOL, '\n', $m);
$style = 'color:#F4006B;font-size:14px;'; $style = 'color:#F4006B;font-size:14px;';
$line[] = "console.error(\"%c{$msg}\", \"{$style}\");"; $line[] = "console.error(\"%c{$msg}\", \"{$style}\");";
// $line[] = "console.error(".json_encode(debug_backtrace()).");";
break; break;
case 'sql': case 'sql':
$msg = str_replace(PHP_EOL, '\n', $m); $msg = str_replace(PHP_EOL, '\n', $m);

15
library/think/log/driver/Trace.php
View File

@@ -68,17 +68,6 @@ class Trace
$info = Debug::getFile(true); $info = Debug::getFile(true);
// 获取调试日志
$debug = [];
foreach ($log as $type => $val) {
foreach ($val as $msg) {
if (!is_string($msg)) {
$msg = var_export($msg, true);
}
$debug[$type][] = $msg;
}
}
// 页面Trace信息 // 页面Trace信息
$trace = []; $trace = [];
foreach ($this->config['trace_tabs'] as $name => $title) { foreach ($this->config['trace_tabs'] as $name => $title) {
@@ -96,11 +85,11 @@ class Trace
$names = explode('|', $name); $names = explode('|', $name);
$result = []; $result = [];
foreach ($names as $name) { foreach ($names as $name) {
$result = array_merge($result, isset($debug[$name]) ? $debug[$name] : []); $result = array_merge($result, isset($log[$name]) ? $log[$name] : []);
} }
$trace[$title] = $result; $trace[$title] = $result;
} else { } else {
$trace[$title] = isset($debug[$name]) ? $debug[$name] : ''; $trace[$title] = isset($log[$name]) ? $log[$name] : '';
} }
} }
} }