From f9888fc67fc229ee61575af39f99de31f1885896 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 2 Mar 2021 11:37:56 +0300
Subject: [PATCH] use separate connection for logging
---
classes/logger/sql.php | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index cf77a1896..784ebef31 100755
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -3,12 +3,18 @@ class Logger_SQL implements Logger_Adapter {
private $pdo;
- function log_error(int $errno, string $errstr, string $file, int $line, $context) {
+ 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);
+ }
- // separate PDO connection object is used for logging
- if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+ function log_error(int $errno, string $errstr, string $file, int $line, $context) {
- if ($this->pdo && get_schema_version() > 117) {
+ 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);
@@ -36,7 +42,7 @@ class Logger_SQL implements Logger_Adapter {
// this would cause a PDOException on insert below
$owner_uid = !empty($_SESSION["uid"]) ? $_SESSION["uid"] : null;
- $entry = ORM::for_table('ttrss_error_log')->create();
+ $entry = ORM::for_table('ttrss_error_log', get_class($this))->create();
$entry->set([
'errno' => $errno,
--
GitLab