valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

store formatted backtrace to sql log

This commit is contained in:
Andrew Dolgov 2015-12-04 15:58:20 +03:00
parent 555afc2ea7
commit b8619f8db0
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/logger/sql.php
View File

@ -8,8 +8,7 @@ class Logger_SQL {
$errstr = Db::get()->escape_string($errstr); $errstr = Db::get()->escape_string($errstr);
$file = Db::get()->escape_string($file); $file = Db::get()->escape_string($file);
$line = Db::get()->escape_string($line); $line = Db::get()->escape_string($line);
$context = ''; // backtrace is a lot of data which is not really critical to store $context = DB::get()->escape_string($context);
//$context = $this->dbh->escape_string(serialize($context));
$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL"; $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";

4
classes/pref/system.php
View File

@ -31,7 +31,7 @@ class Pref_System extends Handler_Protected {
if (LOG_DESTINATION == "sql") { if (LOG_DESTINATION == "sql") {
$result = $this->dbh->query("SELECT errno, errstr, filename, lineno, $result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
created_at, login FROM ttrss_error_log created_at, login, context FROM ttrss_error_log
LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id) LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
ORDER BY ttrss_error_log.id DESC ORDER BY ttrss_error_log.id DESC
LIMIT 100"); LIMIT 100");
@ -61,7 +61,7 @@ class Pref_System extends Handler_Protected {
print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>"; print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>"; print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
print "<td class='errstr'>" . $line["errstr"] . "</td>"; print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
print "<td class='login'>" . $line["login"] . "</td>"; print "<td class='login'>" . $line["login"] . "</td>";
print "<td class='timestamp'>" . print "<td class='timestamp'>" .

35
include/errorhandler.php
View File

@ -1,4 +1,36 @@
<?php <?php
function format_backtrace($trace) {
$rv = "";
$idx = 1;
if (is_array($trace)) {
foreach ($trace as $e) {
if (isset($e["file"]) && isset($e["line"])) {
$fmt_args = [];
if (is_array($e["args"])) {
foreach ($e["args"] as $a) {
if (!is_object($a)) {
array_push($fmt_args, $a);
} else {
array_push($fmt_args, "[" . get_class($a) . "]");
}
}
}
$filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]);
$rv .= sprintf("%d. %s(%s): %s(%s)\n",
$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
$idx++;
}
}
}
return $rv;
}
function ttrss_error_handler($errno, $errstr, $file, $line, $context) { function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
global $logger; global $logger;
global $last_query; global $last_query;
@ -8,6 +40,7 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
if ($last_query) $errstr .= " [Last query: $last_query]"; if ($last_query) $errstr .= " [Last query: $last_query]";
$context = format_backtrace(debug_backtrace());
if (class_exists("Logger")) if (class_exists("Logger"))
return Logger::get()->log_error($errno, $errstr, $file, $line, $context); return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
@ -27,7 +60,7 @@ function ttrss_fatal_handler() {
if (!$errno) return false; if (!$errno) return false;
$context = debug_backtrace(); $context = format_backtrace(debug_backtrace());
$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);