diff options
| -rw-r--r-- | classes/logger/sql.php | 3 | ||||
| -rw-r--r-- | classes/pref/system.php | 4 | ||||
| -rw-r--r-- | include/errorhandler.php | 35 |
3 files changed, 37 insertions, 5 deletions
diff --git a/classes/logger/sql.php b/classes/logger/sql.php index c0f8b4598..96263a97e 100644 --- a/classes/logger/sql.php +++ b/classes/logger/sql.php @@ -8,8 +8,7 @@ class Logger_SQL { $errstr = Db::get()->escape_string($errstr); $file = Db::get()->escape_string($file); $line = Db::get()->escape_string($line); - $context = ''; // backtrace is a lot of data which is not really critical to store - //$context = $this->dbh->escape_string(serialize($context)); + $context = DB::get()->escape_string($context); $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL"; diff --git a/classes/pref/system.php b/classes/pref/system.php index 7accb1f91..6586d6c6c 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -31,7 +31,7 @@ class Pref_System extends Handler_Protected { if (LOG_DESTINATION == "sql") { $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) ORDER BY ttrss_error_log.id DESC 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='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='timestamp'>" . diff --git a/include/errorhandler.php b/include/errorhandler.php index 21cc9a94d..8189feafb 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -1,4 +1,36 @@ <?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) { global $logger; 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); if ($last_query) $errstr .= " [Last query: $last_query]"; + $context = format_backtrace(debug_backtrace()); if (class_exists("Logger")) return Logger::get()->log_error($errno, $errstr, $file, $line, $context); @@ -27,7 +60,7 @@ function ttrss_fatal_handler() { if (!$errno) return false; - $context = debug_backtrace(); + $context = format_backtrace(debug_backtrace()); $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); |