From 1577e66fa175cf84eb51f8ebc92fcb9e5d788136 Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.pe.kr>
Date: Thu, 20 Nov 2014 12:08:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=AC=EB=A1=9C=EC=9A=B0=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=20=EB=B2=84=ED=8D=BC=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

버퍼 처리는 프로파일러 모듈에서 하도록 수정
---
 classes/display/DisplayHandler.class.php |  2 ++
 config/func.inc.php                      | 17 ++++++++++++++---
 modules/addon/addon.controller.php       |  4 +---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 9cdfd9c9b..4ee8f25aa 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -126,6 +126,8 @@ class DisplayHandler extends Handler
 
 		// call a trigger after display
 		ModuleHandler::triggerCall('display', 'after', $output);
+
+		flushSlowlog();
 	}
 
 	/**
diff --git a/config/func.inc.php b/config/func.inc.php
index b5456a184..3eb5c3f87 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -917,15 +917,26 @@ function writeSlowlog($type, $elapsed_time, $obj)
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	$trigger_args = $obj;
-	$trigger_args->_log_type = $type;
-	$trigger_args->_elapsed_time = $elapsed_time;
 	if($type != 'query')
 	{
+		$trigger_args = $obj;
+		$trigger_args->_log_type = $type;
+		$trigger_args->_elapsed_time = $elapsed_time;
 		ModuleHandler::triggerCall('XE.writeSlowlog', 'after', $trigger_args);
 	}
 }
 
+/**
+ * @param void
+ */
+function flushSlowlog()
+{
+	$trigger_args = new stdClass();
+	$trigger_args->_log_type = 'flush';
+	$trigger_args->_elapsed_time = 0;
+	ModuleHandler::triggerCall('XE.writeSlowlog', 'after', $trigger_args);
+}
+
 /**
  * microtime() return
  *
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 294c1d6e2..241d10534 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -130,12 +130,10 @@ class addonController extends addon
 			$buff[] = '}}}';
 			$buff[] = '$after_time = microtime(true);';
 			$buff[] = '$addon_time_log = new stdClass();';
-			$buff[] = '$addon_time_log->_log_type = "addon";';
 			$buff[] = '$addon_time_log->caller = $called_position;';
 			$buff[] = '$addon_time_log->called = "' . $addon . '";';
 			$buff[] = '$addon_time_log->called_extension = "' . $addon . '";';
-			$buff[] = '$addon_time_log->_elapsed_time = $after_time-$before_time;';
-			$buff[] = 'ModuleHandler::triggerCall("XE.writeSlowlog", "after", $addon_time_log);';
+			$buff[] = 'writeSlowlog("addon",$after_time-$before_time,$addon_time_log);';
 		}
 		$addon_path = _XE_PATH_ . 'files/cache/addons/';
 		FileHandler::makeDir($addon_path);