From 381d4d72b3f117da590bfc3002a55d8a2f9a9a89 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Wed, 24 Sep 2014 23:58:57 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=20slowlog?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=BD=94=EC=96=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.controller.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 1405b3ad9..744f02402 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -82,6 +82,7 @@ class addonController extends addon $buff = array('getInsertedAddons($site_srl, $gtype); + $i=0; foreach($addon_list as $addon => $val) { if($val->addon == "smartphone" @@ -100,6 +101,7 @@ class addonController extends addon $mid_list = NULL; } + $buff[] = '$before_time = microtime(true);'; $buff[] = '$rm = \'' . $extra_vars->xe_run_method . "';"; $buff[] = '$ml = array('; if($mid_list) @@ -127,8 +129,17 @@ class addonController extends addon $buff[] = 'if(isset($ml[$_m]) || count($ml) === 0){'; $buff[] = $addon_include; $buff[] = '}}}'; + $buff[] = '$after_time = microtime(true);'; + $buff[] = 'if($after_time - $before_time > $db_info->slow_addon_time){'; + $buff[] = '$addon_time_log[' . $i . '] = new stdClass();'; + $buff[] = '$addon_time_log[' . $i . ']->type="addon";'; + $buff[] = '$addon_time_log[' . $i . ']->hash_id=md5($called_position . "' . $addon . '");'; + $buff[] = '$addon_time_log[' . $i . ']->caller=$called_position;'; + $buff[] = '$addon_time_log[' . $i . ']->called="' . $addon . '";'; + $buff[] = '}'; + $i++; } - + $buff[] = '$total_addon_count=' . ($i-1) . ';'; $addon_path = _XE_PATH_ . 'files/cache/addons/'; FileHandler::makeDir($addon_path); $addon_file = $addon_path . ($gtype == 'site' ? $site_srl : '') . $type . '.acivated_addons.cache.php'; From bb5db1222436c88c509d3e549aa730207fea5621 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Thu, 25 Sep 2014 00:02:05 +0900 Subject: [PATCH 2/6] Update addon.controller.php --- modules/addon/addon.controller.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 744f02402..5c2a753e8 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -82,7 +82,6 @@ class addonController extends addon $buff = array('getInsertedAddons($site_srl, $gtype); - $i=0; foreach($addon_list as $addon => $val) { if($val->addon == "smartphone" @@ -130,14 +129,14 @@ class addonController extends addon $buff[] = $addon_include; $buff[] = '}}}'; $buff[] = '$after_time = microtime(true);'; - $buff[] = 'if($after_time - $before_time > $db_info->slow_addon_time){'; - $buff[] = '$addon_time_log[' . $i . '] = new stdClass();'; - $buff[] = '$addon_time_log[' . $i . ']->type="addon";'; - $buff[] = '$addon_time_log[' . $i . ']->hash_id=md5($called_position . "' . $addon . '");'; - $buff[] = '$addon_time_log[' . $i . ']->caller=$called_position;'; - $buff[] = '$addon_time_log[' . $i . ']->called="' . $addon . '";'; + $buff[] = 'if($after_time-$before_time>$db_info->slow_addon_time){'; + $buff[] = '$addon_time_log = new stdClass();'; + $buff[] = '$addon_time_log->type = "addon";'; + $buff[] = '$addon_time_log->hash_id = md5($called_position . "' . $addon . '");'; + $buff[] = '$addon_time_log->caller = $called_position;'; + $buff[] = '$addon_time_log->called = "' . $addon . '";'; + $buff[] = '//trigger call here'; $buff[] = '}'; - $i++; } $buff[] = '$total_addon_count=' . ($i-1) . ';'; $addon_path = _XE_PATH_ . 'files/cache/addons/'; From 30dff8f13141207bac65ac53cd003fc88d06d8c7 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Thu, 25 Sep 2014 00:13:35 +0900 Subject: [PATCH 3/6] Update addon.controller.php --- modules/addon/addon.controller.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 5c2a753e8..6914f7156 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -138,7 +138,6 @@ class addonController extends addon $buff[] = '//trigger call here'; $buff[] = '}'; } - $buff[] = '$total_addon_count=' . ($i-1) . ';'; $addon_path = _XE_PATH_ . 'files/cache/addons/'; FileHandler::makeDir($addon_path); $addon_file = $addon_path . ($gtype == 'site' ? $site_srl : '') . $type . '.acivated_addons.cache.php'; From 12efdf602e3961fdfaaee9f9eef95097b2f95344 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Wed, 1 Oct 2014 10:38:29 +0900 Subject: [PATCH 4/6] =?UTF-8?q?trigger=20=ED=98=B8=EC=B6=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 6914f7156..1bab07f36 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -135,7 +135,7 @@ class addonController extends addon $buff[] = '$addon_time_log->hash_id = md5($called_position . "' . $addon . '");'; $buff[] = '$addon_time_log->caller = $called_position;'; $buff[] = '$addon_time_log->called = "' . $addon . '";'; - $buff[] = '//trigger call here'; + $buff[] = 'ModuleHandler::triggerCall("XE.writeSlowlog", "after", $addon_time_log);'; $buff[] = '}'; } $addon_path = _XE_PATH_ . 'files/cache/addons/'; From 4c4b01929306a5d4556b5e53703fc71cd9d25ce0 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Sat, 4 Oct 2014 17:58:57 +0900 Subject: [PATCH 5/6] =?UTF-8?q?$db=5Finfo=EB=A5=BC=20=EA=B0=80=EC=A0=B8?= =?UTF-8?q?=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 1bab07f36..8e15a3d3e 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -79,7 +79,7 @@ class addonController extends addon function makeCacheFile($site_srl = 0, $type = "pc", $gtype = 'site') { // Add-on module for use in creating the cache file - $buff = array('getInsertedAddons($site_srl, $gtype); foreach($addon_list as $addon => $val) From fd46b7aef27ec1ee25a82cbb22a3067704397458 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Sat, 11 Oct 2014 15:18:21 +0900 Subject: [PATCH 6/6] =?UTF-8?q?trigger=EB=A1=9C=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EB=B3=80=EC=88=98=EB=A5=BC=20=EC=A0=84=EB=8B=AC?= =?UTF-8?q?=ED=95=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.controller.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 8e15a3d3e..4f6423a2d 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -129,12 +129,13 @@ class addonController extends addon $buff[] = $addon_include; $buff[] = '}}}'; $buff[] = '$after_time = microtime(true);'; - $buff[] = 'if($after_time-$before_time>$db_info->slow_addon_time){'; + $buff[] ='if($after_time-$before_time>$db_info->slowlog[\'time_addon\']){'; $buff[] = '$addon_time_log = new stdClass();'; - $buff[] = '$addon_time_log->type = "addon";'; - $buff[] = '$addon_time_log->hash_id = md5($called_position . "' . $addon . '");'; + $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[] = '}'; }