diff options
author | Andrew Dolgov <[email protected]> | 2023-10-25 12:55:09 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2023-10-25 12:55:09 +0300 |
commit | 865ecc87963dc3b26e66296616eef2a1cc41ac3f (patch) | |
tree | bf2ecd8a391103bdb2c8b70cd33c47467310754b /classes/logger | |
parent | 0a5507d3bd79d04c860455664f919bf8e7274fda (diff) |
move to psr-4 autoloader
Diffstat (limited to 'classes/logger')
-rw-r--r-- | classes/logger/adapter.php | 4 | ||||
-rwxr-xr-x | classes/logger/sql.php | 61 | ||||
-rw-r--r-- | classes/logger/stdout.php | 31 | ||||
-rw-r--r-- | classes/logger/syslog.php | 31 |
4 files changed, 0 insertions, 127 deletions
diff --git a/classes/logger/adapter.php b/classes/logger/adapter.php deleted file mode 100644 index b0287b5fa..000000000 --- a/classes/logger/adapter.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -interface Logger_Adapter { - function log_error(int $errno, string $errstr, string $file, int $line, string $context): bool; -} diff --git a/classes/logger/sql.php b/classes/logger/sql.php deleted file mode 100755 index 5f3c67852..000000000 --- a/classes/logger/sql.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -class Logger_SQL implements Logger_Adapter { - - function __construct() { - $conn = get_class($this); - - ORM::configure(Db::get_dsn(), null, $conn); - ORM::configure('username', Config::get(Config::DB_USER), $conn); - ORM::configure('password', Config::get(Config::DB_PASS), $conn); - ORM::configure('return_result_sets', true, $conn); - } - - function log_error(int $errno, string $errstr, string $file, int $line, string $context): bool { - - if (Config::get_schema_version() > 117) { - - // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge - $context = mb_substr($context, 0, 8192); - - $server_params = [ - "Real IP" => "HTTP_X_REAL_IP", - "Forwarded For" => "HTTP_X_FORWARDED_FOR", - "Forwarded Protocol" => "HTTP_X_FORWARDED_PROTO", - "Remote IP" => "REMOTE_ADDR", - "Request URI" => "REQUEST_URI", - "User agent" => "HTTP_USER_AGENT", - ]; - - foreach ($server_params as $n => $p) { - if (isset($_SERVER[$p])) - $context .= "\n$n: " . $_SERVER[$p]; - } - - // passed error message may contain invalid unicode characters, failing to insert an error here - // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc - $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8'); - $context = UConverter::transcode($context, 'UTF-8', 'UTF-8'); - - // can't use $_SESSION["uid"] ?? null because what if its, for example, false? or zero? - // this would cause a PDOException on insert below - $owner_uid = !empty($_SESSION["uid"]) ? $_SESSION["uid"] : null; - - $entry = ORM::for_table('ttrss_error_log', get_class($this))->create(); - - $entry->set([ - 'errno' => $errno, - 'errstr' => $errstr, - 'filename' => $file, - 'lineno' => (int)$line, - 'context' => $context, - 'owner_uid' => $owner_uid, - 'created_at' => Db::NOW(), - ]); - - return $entry->save(); - } - - return false; - } - -} diff --git a/classes/logger/stdout.php b/classes/logger/stdout.php deleted file mode 100644 index b15649028..000000000 --- a/classes/logger/stdout.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -class Logger_Stdout implements Logger_Adapter { - - function log_error(int $errno, string $errstr, string $file, int $line, string $context): bool { - - switch ($errno) { - case E_ERROR: - case E_PARSE: - case E_CORE_ERROR: - case E_COMPILE_ERROR: - case E_USER_ERROR: - $priority = LOG_ERR; - break; - case E_WARNING: - case E_CORE_WARNING: - case E_COMPILE_WARNING: - case E_USER_WARNING: - $priority = LOG_WARNING; - break; - default: - $priority = LOG_INFO; - } - - $errname = Logger::ERROR_NAMES[$errno] . " ($errno)"; - - print "[EEE] $priority $errname ($file:$line) $errstr\n"; - - return true; - } - -} diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php deleted file mode 100644 index 568398ee0..000000000 --- a/classes/logger/syslog.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -class Logger_Syslog implements Logger_Adapter { - - function log_error(int $errno, string $errstr, string $file, int $line, string $context): bool { - - switch ($errno) { - case E_ERROR: - case E_PARSE: - case E_CORE_ERROR: - case E_COMPILE_ERROR: - case E_USER_ERROR: - $priority = LOG_ERR; - break; - case E_WARNING: - case E_CORE_WARNING: - case E_COMPILE_WARNING: - case E_USER_WARNING: - $priority = LOG_WARNING; - break; - default: - $priority = LOG_INFO; - } - - $errname = Logger::ERROR_NAMES[$errno] . " ($errno)"; - - syslog($priority, "[tt-rss] $errname ($file:$line) $errstr"); - - return true; - } - -} |