fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Minor adjustments

Browse source
This commit is contained in:
Kijin Sung 2016-02-12 20:33:05 +09:00
parent 4b835bfe71
commit 8394afce74
4 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/db/DB.class.php
View file

@ -364,6 +364,7 @@ class DB
$log['module'] = $site_module_info->module;
$log['act'] = Context::get('act');
$log['time'] = date('Y-m-d H:i:s');
$log['backtrace'] = array();
$bt = version_compare(PHP_VERSION, '5.3.6', '>=') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace();
@ -371,6 +372,7 @@ class DB
{
if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
{
$log['backtrace'] = array_slice($bt, $no);
$call_no = $no;
$call_no++;
$log['called_file'] = $bt[$call_no]['file'];

9
classes/display/DisplayHandler.class.php
View file

@ -121,14 +121,15 @@ class DisplayHandler extends Handler
// results directly output
print $output;
// debugOutput output
$this->content_size = strlen($output);
print $this->getDebugInfo();
// call a trigger after display
ModuleHandler::triggerCall('display', 'after', $output);
// debugOutput output
$this->content_size = strlen($output);
print $this->getDebugInfo($output);
flushSlowlog();
}
@ -137,7 +138,7 @@ class DisplayHandler extends Handler
*
* @return string
*/
public function getDebugInfo()
public function getDebugInfo(&$output)
{
// Check if debugging is enabled for this request.
if (!config('debug.enabled'))

20
common/framework/debug.php
View file

@ -94,7 +94,7 @@ class Debug
* Add an arbitrary entry to the log.
*
* @param string $message
* @return bool
* @return void
*/
public static function addEntry($message)
{
@ -112,7 +112,6 @@ class Debug
'backtrace' => $backtrace,
);
self::$_entries[] = $entry;
return true;
}
/**
@ -166,11 +165,24 @@ class Debug
/**
* Add a query to the log.
*
* @return bool
* @return void
*/
public static function addQuery($query)
{
self::$_queries[] = $query;
self::$_queries[] = (object)array(
'type' => 'Query',
'time' => microtime(true),
'message' => $query['result'] === 'success' ? 'success' : $query['errstr'],
'error_code' => $query['result'] === 'success' ? 0 : $query['errno'],
'query_id' => $query['query_id'],
'query_connection' => $query['connection'],
'query_string' => $query['query'],
'query_time' => $query['elapsed_time'],
'file' => $query['called_file'],
'line' => $query['called_line'],
'method' => $query['called_method'],
'backtrace' => $query['backtrace'],
);
}
/**

36
common/tpl/debug_comment.html
View file

@ -51,16 +51,7 @@ Debug Entries
{
$backtrace['file'] = substr($backtrace['file'], $basedir_len);
}
if (isset($error->backtrace[$key + 1]))
{
$next_backtrace = $error->backtrace[$key + 1];
$called_function = sprintf(' (%s%s%s)', $next_backtrace['class'], $next_backtrace['type'], $next_backtrace['function']);
}
else
{
$called_function = '';
}
echo sprintf(' - %s line %d%s', $backtrace['file'], $backtrace['line'], $called_function) . "\n";
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
}
}
?>
@ -85,16 +76,7 @@ Error logging is disabled.
{
$backtrace['file'] = substr($backtrace['file'], $basedir_len);
}
if (isset($error->backtrace[$key + 1]))
{
$next_backtrace = $error->backtrace[$key + 1];
$called_function = sprintf(' (%s%s%s)', $next_backtrace['class'], $next_backtrace['type'], $next_backtrace['function']);
}
else
{
$called_function = '';
}
echo sprintf(' - %s line %d%s', $backtrace['file'], $backtrace['line'], $called_function) . "\n";
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
}
}
?>
@ -113,16 +95,16 @@ Query logging is disabled.
}
foreach ($queries as $query)
{
if (!strncmp($query['called_file'], RX_BASEDIR, $basedir_len))
if (!strncmp($query->file, RX_BASEDIR, $basedir_len))
{
$query['called_file'] = substr($query['called_file'], $basedir_len);
$query->file = substr($query->file, $basedir_len);
}
$query_caller = sprintf('%s line %d (%s)', $query['called_file'], $query['called_line'], $query['called_method']);
$query_result = ($query['result'] === 'success') ? 'success' : sprintf('error %d %s', $query['errno'], $query['errstr']);
echo sprintf('%02d. %s', ++$query_count, $query['query']) . "\n";
$query_caller = sprintf('%s line %d (%s)', $query->file, $query->line, $query->method);
$query_result = ($query->message === 'success') ? 'success' : sprintf('error %d %s', $query->error_code, $query->message);
echo sprintf('%02d. %s', ++$query_count, $query->query_string) . "\n";
echo sprintf(' - Caller: %s', $query_caller) . "\n";
echo sprintf(' - Connection: %s', $query['connection']) . "\n";
echo sprintf(' - Query Time: %0.4f sec', $query['elapsed_time']) . "\n";
echo sprintf(' - Connection: %s', $query->query_connection) . "\n";
echo sprintf(' - Query Time: %0.4f sec', $query->query_time) . "\n";
echo sprintf(' - Result: %s', $query_result) . "\n";
}
?>