From 7352655e36182766aa86b0f2444ebb46addf6ec5 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 27 Jan 2016 23:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E8=B0=83=E8=AF=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php       | 4 ++--
 library/think/Hook.php      | 8 ++++----
 library/think/View.php      | 5 ++++-
 library/think/db/Driver.php | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index b61804e6..b0c6831a 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -120,7 +120,7 @@ class App
         $reflect = new \ReflectionFunction($function);
         $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);
     }
 
@@ -149,7 +149,7 @@ class App
         }
         $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);
     }
 
diff --git a/library/think/Hook.php b/library/think/Hook.php
index 967c6626..ade83e0b 100644
--- a/library/think/Hook.php
+++ b/library/think/Hook.php
@@ -23,15 +23,15 @@ class Hook
      * @param bool $first 是否放到开头执行
      * @return void
      */
-    public static function add($tag, $behavior,$first=false)
+    public static function add($tag, $behavior, $first = false)
     {
         if (!isset(self::$tags[$tag])) {
             self::$tags[$tag] = [];
         }
         if (is_array($behavior)) {
             self::$tags[$tag] = array_merge(self::$tags[$tag], $behavior);
-        } elseif($first){
-            array_unshift(self::$tags[$tag],$behavior);
+        } elseif ($first) {
+            array_unshift(self::$tags[$tag], $behavior);
         } else {
             self::$tags[$tag][] = $behavior;
         }
@@ -101,7 +101,7 @@ class Hook
 
                 if (APP_DEBUG) {
                     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) {
                     // 如果返回false 则中断行为执行
diff --git a/library/think/View.php b/library/think/View.php
index 185c9fab..94efce44 100644
--- a/library/think/View.php
+++ b/library/think/View.php
@@ -149,6 +149,8 @@ class View
      */
     public function fetch($template = '', $vars = [], $cache = [], $renderContent = false)
     {
+        // 模板变量
+        $vars = $vars ? $vars : $this->data;
         if (!$renderContent) {
             // 获取模板文件名
             $template = $this->parseTemplate($template);
@@ -157,8 +159,9 @@ class View
             if (!is_file($template) || (APP_DEBUG && IS_WIN && realpath($template) != $template)) {
                 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_implicit_flush(0);
diff --git a/library/think/db/Driver.php b/library/think/db/Driver.php
index 0f974b24..8c795fce 100644
--- a/library/think/db/Driver.php
+++ b/library/think/db/Driver.php
@@ -1179,7 +1179,7 @@ abstract class Driver
                     }
                     $log .= '[ EXPLAIN : ' . var_export($result, true) . ' ]';
                 }
-                Log::record($log, 'sql');
+                Log::record('[ SQL ] ' . $log, 'sql');
             }
         }
     }