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

加强调试信息

Browse Source
This commit is contained in:
thinkphp
2016-01-27 23:05:46 +08:00
parent cc753a884e
commit 7352655e36
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/App.php
View File

@@ -120,7 +120,7 @@ class App
$reflect = new \ReflectionFunction($function); $reflect = new \ReflectionFunction($function);
$args = self::bindParams($reflect, $vars); $args = self::bindParams($reflect, $vars);
// 记录执行信息 // 记录执行信息
Log::record('[ RUN ] ' . $reflect->getFileName(), 'info'); Log::record('[ RUN ] ' . $reflect->getFileName() . '[ ' . var_export($vars, true) . ' ]', 'info');
return $reflect->invokeArgs($args); return $reflect->invokeArgs($args);
} }
@@ -149,7 +149,7 @@ class App
} }
$args = self::bindParams($reflect, $vars); $args = self::bindParams($reflect, $vars);
// 记录执行信息 // 记录执行信息
Log::record('[ RUN ] ' . $reflect->getFileName(), 'info'); Log::record('[ RUN ] ' . $reflect->getFileName() . '[ ' . var_export($args, true) . ' ]', 'info');
return $reflect->invokeArgs(isset($class) ? $class : null, $args); return $reflect->invokeArgs(isset($class) ? $class : null, $args);
} }

8
library/think/Hook.php
View File

@@ -23,15 +23,15 @@ class Hook
* @param bool $first 是否放到开头执行 * @param bool $first 是否放到开头执行
* @return void * @return void
*/ */
public static function add($tag, $behavior,$first=false) public static function add($tag, $behavior, $first = false)
{ {
if (!isset(self::$tags[$tag])) { if (!isset(self::$tags[$tag])) {
self::$tags[$tag] = []; self::$tags[$tag] = [];
} }
if (is_array($behavior)) { if (is_array($behavior)) {
self::$tags[$tag] = array_merge(self::$tags[$tag], $behavior); self::$tags[$tag] = array_merge(self::$tags[$tag], $behavior);
} elseif($first){ } elseif ($first) {
array_unshift(self::$tags[$tag],$behavior); array_unshift(self::$tags[$tag], $behavior);
} else { } else {
self::$tags[$tag][] = $behavior; self::$tags[$tag][] = $behavior;
} }
@@ -101,7 +101,7 @@ class Hook
if (APP_DEBUG) { if (APP_DEBUG) {
Debug::remark('behavior_end', 'time'); Debug::remark('behavior_end', 'time');
Log::record('Run ' . $name . ' [ RunTime:' . Debug::getRangeTime('behavior_start', 'behavior_end') . 's ]', 'log'); Log::record('[ BEHAVIOR ] Run ' . $name . ' @' . $tag . ' [ RunTime:' . Debug::getRangeTime('behavior_start', 'behavior_end') . 's ]', 'log');
} }
if (false === $result) { if (false === $result) {
// 如果返回false 则中断行为执行 // 如果返回false 则中断行为执行

5
library/think/View.php
View File

@@ -149,6 +149,8 @@ class View
*/ */
public function fetch($template = '', $vars = [], $cache = [], $renderContent = false) public function fetch($template = '', $vars = [], $cache = [], $renderContent = false)
{ {
// 模板变量
$vars = $vars ? $vars : $this->data;
if (!$renderContent) { if (!$renderContent) {
// 获取模板文件名 // 获取模板文件名
$template = $this->parseTemplate($template); $template = $this->parseTemplate($template);
@@ -157,8 +159,9 @@ class View
if (!is_file($template) || (APP_DEBUG && IS_WIN && realpath($template) != $template)) { if (!is_file($template) || (APP_DEBUG && IS_WIN && realpath($template) != $template)) {
throw new Exception('template file not exists:' . $template, 10700); throw new Exception('template file not exists:' . $template, 10700);
} }
// 记录视图信息
Log::record('[ VIEW ] ' . $template . ' [ VARS : ' . var_export($vars, true) . ' ]', 'info');
} }
$vars = $vars ? $vars : $this->data;
// 页面缓存 // 页面缓存
ob_start(); ob_start();
ob_implicit_flush(0); ob_implicit_flush(0);

2
library/think/db/Driver.php
View File

@@ -1179,7 +1179,7 @@ abstract class Driver
} }
$log .= '[ EXPLAIN : ' . var_export($result, true) . ' ]'; $log .= '[ EXPLAIN : ' . var_export($result, true) . ' ]';
} }
Log::record($log, 'sql'); Log::record('[ SQL ] ' . $log, 'sql');
} }
} }
} }