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

Show query errors in debug panel and error log

Browse source
This commit is contained in:
Kijin Sung 2016-12-13 14:09:51 +09:00
parent 714035c3a0
commit 2db14c1ea9
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -369,7 +369,7 @@ class DB
$log['time'] = date('Y-m-d H:i:s'); $log['time'] = date('Y-m-d H:i:s');
$log['backtrace'] = array(); $log['backtrace'] = array();
if (config('debug.enabled') && in_array('queries', config('debug.display_content'))) if (config('debug.enabled') && ($this->isError() || in_array('queries', config('debug.display_content'))))
{ {
$bt = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS); $bt = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS);
foreach($bt as $no => $call) foreach($bt as $no => $call)

25
common/framework/debug.php
View file

@ -236,10 +236,33 @@ class Debug
'file' => $query['called_file'], 'file' => $query['called_file'],
'line' => $query['called_line'], 'line' => $query['called_line'],
'method' => $query['called_method'], 'method' => $query['called_method'],
'backtrace' => $query['backtrace'], 'backtrace' => $query['backtrace'] ?: array(),
); );
self::$_queries[] = $query_object; self::$_queries[] = $query_object;
// Add the entry to the error log if the result wasn't successful.
if ($query['result'] === 'error')
{
$error_object = (object)array(
'type' => 'Query Error',
'time' => $query_object->time,
'message' => $query['errstr'] . ' (code ' . intval($query['errno']) . ')',
'file' => $query_object->file,
'line' => $query_object->line,
'backtrace' => $query_object->backtrace ?: array(),
);
self::$_errors[] = $error_object;
if (config('debug.write_error_log') === 'all')
{
$log_entry = strtr(sprintf('Query Error: %s in %s on line %d', $error_object->message, $error_object->file, intval($error_object->line)), "\0\r\n\t\v\e\f", ' ');
error_log($log_entry . \PHP_EOL . self::formatBacktrace($error_object->backtrace));
}
}
// Add the entry to the slow query log.
if ($query_object->query_time && $query_object->query_time >= config('debug.log_slow_queries')) if ($query_object->query_time && $query_object->query_time >= config('debug.log_slow_queries'))
{ {
self::$_slow_queries[] = $query_object; self::$_slow_queries[] = $query_object;