summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-12-04 15:58:20 +0300
committerAndrew Dolgov <[email protected]>2015-12-04 15:58:20 +0300
commitb8619f8db01c10500814171631c83da3f770ea03 (patch)
tree5e571087b872f6ab24a7e4abde2aec08032a1200 /classes
parent555afc2ea7a1117ca053b9af193c15ce62174bdb (diff)
store formatted backtrace to sql log
Diffstat (limited to 'classes')
-rw-r--r--classes/logger/sql.php3
-rw-r--r--classes/pref/system.php4
2 files changed, 3 insertions, 4 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'>" .