fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-30 15:52:17 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/1.7.8' into develop

Browse source 
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.7.7.2');
define('__XE_VERSION__', '1.7.8');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
@ -87,6 +87,9 @@ else
* define('__DEBUG_PROTECT_IP__', '127.0.0.1');
* define('__DEBUG_DB_OUTPUT__', 0);
* define('__LOG_SLOW_QUERY__', 0);
* define('__LOG_SLOW_TRIGGER__', 0);
* define('__LOG_SLOW_ADDON__', 0);
* define('__LOG_SLOW_WIDGET__', 0);
* define('__OB_GZHANDLER_ENABLE__', 1);
* define('__ENABLE_PHPUNIT_TEST__', 0);
* define('__PROXY_SERVER__', 'http://domain:port/path');
@ -167,7 +170,7 @@ if(!defined('__LOG_SLOW_QUERY__'))
* <pre>
* 0: Do not leave a log
* = 0: leave a log when the slow query takes over specified seconds
* Log file is saved as ./files/_db_slow_query.php file
* Log file is saved as ./files/_slowlog_query.php file
* </pre>
*/
define('__LOG_SLOW_QUERY__', 0);
@ -181,12 +184,40 @@ if(!defined('__LOG_SLOW_TRIGGER__'))
* <pre>
* 0: Do not leave a log
* > 0: leave a log when the trigger takes over specified milliseconds
* Log file is saved as ./files/_db_slow_trigger.php file
* Log file is saved as ./files/_slowlog_trigger.php
* </pre>
*/
define('__LOG_SLOW_TRIGGER__', 0);
}
if(!defined('__LOG_SLOW_ADDON__'))
{
/**
* Addon excute time log
*
* <pre>
* 0: Do not leave a log
* > 0: leave a log when the trigger takes over specified milliseconds
* Log file is saved as ./files/_slowlog_addon.php
* </pre>
*/
define('__LOG_SLOW_ADDON__', 0);
}
if(!defined('__LOG_SLOW_WIDGET__'))
{
/**
* Widget excute time log
*
* <pre>
* 0: Do not leave a log
* > 0: leave a log when the widget takes over specified milliseconds
* Log file is saved as ./files/_slowlog_widget.php
* </pre>
*/
define('__LOG_SLOW_WIDGET__', 0);
}
if(!defined('__DEBUG_QUERY__'))
{
/**

31
config/func.inc.php
View file

@ -845,10 +845,13 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu
*/
function writeSlowlog($type, $elapsed_time, $obj)
{
if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
static $log_filename = array(
'query' => 'files/_slowlog_query.php',
'trigger' => 'files/_slowlog_trigger.php',
'addon' => 'files/_slowlog_addon.php'
'addon' => 'files/_slowlog_addon.php',
'widget' => 'files/_slowlog_widget.php'
);
$write_file = true;
@ -863,6 +866,15 @@ function writeSlowlog($type, $elapsed_time, $obj)
$buff[] = "\tCaller : " . $obj->caller;
$buff[] = "\tCalled : " . $obj->called;
}
else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
{
$buff[] = "\tAddon : " . $obj->called;
$buff[] = "\tCalled position : " . $obj->caller;
}
else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
{
$buff[] = "\tWidget : " . $obj->called;
}
else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
{
@ -883,15 +895,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
*