Merge pull request #404 from RaphaelRochet/master

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

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 2c8d35f8371c4a8b2759d014642245910b50ad97..52431c2de41004ade39892b2289a9b28bd3e6861 100644 (file)
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,22 +1,13 @@
 <?php
-// TODO: make configurable
-require_once "classes/logger.php";
-require_once "classes/logger/sql.php";
-
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
        global $logger;
 
        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);
-       }
-
-       return false;
+       if (class_exists("Logger"))
+               return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 }
 
 function ttrss_fatal_handler() {
@@ -36,14 +27,8 @@ function ttrss_fatal_handler() {
 
                $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-               if (!$logger) $logger = new Logger_SQL();
-
-               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;