pngcrush.sh

[tt-rss.git] / include / errorhandler.php

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 9acef23575c624acbc21f06ef62fcc607db42582..95c9edc69df9ac7b8ad3f414741a844a88b3fe6c 100644 (file)
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,16 +1,50 @@
 <?php
-function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-       global $logger;
+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) {
        if (error_reporting() == 0 || !$errno) return false;
 
        $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-       return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+       $context = format_backtrace(debug_backtrace());
+       $errstr = truncate_middle($errstr, 16384, " (...) ");
+
+       if (class_exists("Logger"))
+               return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 }
 
 function ttrss_fatal_handler() {
-       global $logger;
+       global $last_query;
 
        $error = error_get_last();
 
@@ -22,11 +56,14 @@ 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);
 
-               return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+               if ($last_query) $errstr .= " [Last query: $last_query]";
+
+               if (class_exists("Logger"))
+                       return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
        }
 
        return false;
@@ -34,4 +71,4 @@ function ttrss_fatal_handler() {
 
 register_shutdown_function('ttrss_fatal_handler');
 set_error_handler('ttrss_error_handler');
-?>
+