X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Ferrorhandler.php;h=95c9edc69df9ac7b8ad3f414741a844a88b3fe6c;hb=HEAD;hp=6b64d5161bad2ced4252cc4ec7981a1c4e65b1f1;hpb=e441b5837b84f8313e506a3d1b087f269f4a9fb3;p=tt-rss.git

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 6b64d516..95c9edc6 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,26 +1,50 @@
 <?php
-// TODO: make configurable
-require_once "classes/logger.php";
-require_once "classes/logger/sql.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++;
+			}
+		}
+	}
 
-function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	global $logger;
+	return $rv;
+}
 
+function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	if (error_reporting() == 0 || !$errno) return false;
 
-	if (!$logger) $logger = new Logger_SQL();
-
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-	if ($logger) {
-		return $logger->log_error($errno, $errstr, $file, $line, $context);
-	}
+	$context = format_backtrace(debug_backtrace());
+	$errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	return false;
+	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();
 
@@ -32,23 +56,19 @@ 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);
 
-		if (!$logger) $logger = new Logger_SQL();
+		if ($last_query) $errstr .= " [Last query: $last_query]";
 
-		if ($logger) {
-			if ($logger->log_error($errno, $errstr, $file, $line, $context)) {
-				return true;
-			}
-		}
-		return false;
+		if (class_exists("Logger"))
+			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 	}
 
 	return false;
 }
 
-//register_shutdown_function('ttrss_fatal_handler');
-//set_error_handler('ttrss_error_handler');
-?>
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
+