public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-21 08:51:29 +00:00
Code Issues Releases Wiki Activity

better handle PDOExceptions during open transaction in feed update

Browse Source
This commit is contained in:
Andrew Dolgov
2018-11-03 15:00:58 +03:00
parent 5f66f872b6
commit 2c940c4861
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
classes/rssutils.php
View File

@@ -50,8 +50,8 @@ class RSSUtils {
if (!$tmph->fetch()) { if (!$tmph->fetch()) {
$tmph = $pdo->prepare("INSERT INTO ttrss_feedbrowser_cache $tmph = $pdo->prepare("INSERT INTO ttrss_feedbrowser_cache
(feed_url, site_url, title, subscribers) (feed_url, site_url, title, subscribers)
VALUES VALUES
(?, ?, ?, ?)"); (?, ?, ?, ?)");
$tmph->execute([$feed_url, $site_url, $title, $subscribers]); $tmph->execute([$feed_url, $site_url, $title, $subscribers]);
@@ -192,6 +192,13 @@ class RSSUtils {
RSSUtils::update_rss_feed($tline["id"], true, false); RSSUtils::update_rss_feed($tline["id"], true, false);
} catch (PDOException $e) { } catch (PDOException $e) {
Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString()); Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
try {
$pdo->rollback();
} catch (PDOException $e) {
// it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
// thrown outside of an active transaction during feed update
}
} }
_debug_suppress(false); _debug_suppress(false);
@@ -333,12 +340,12 @@ class RSSUtils {
$sth = $pdo->prepare("SELECT id,update_interval,auth_login, $sth = $pdo->prepare("SELECT id,update_interval,auth_login,
feed_url,auth_pass,cache_images, feed_url,auth_pass,cache_images,
mark_unread_on_update, owner_uid, mark_unread_on_update, owner_uid,
auth_pass_encrypted, feed_language, auth_pass_encrypted, feed_language,
last_modified, last_modified,
".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional ".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional
FROM ttrss_feeds WHERE id = ?"); FROM ttrss_feeds WHERE id = ?");
$sth->execute([$feed]); $sth->execute([$feed]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
$owner_uid = $row["owner_uid"]; $owner_uid = $row["owner_uid"];
@@ -852,7 +859,7 @@ class RSSUtils {
$usth = $pdo->prepare( $usth = $pdo->prepare(
"INSERT INTO ttrss_entries "INSERT INTO ttrss_entries
(title, (title,
guid, guid,
link, link,
updated, updated,
@@ -921,7 +928,7 @@ class RSSUtils {
_debug("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled); _debug("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled);
} else { } else {
_debug("user record not found, creating...", $debug_enabled); _debug("user record not found, creating...", $debug_enabled);
if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) { if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
@@ -984,7 +991,7 @@ class RSSUtils {
num_comments = :num_comments, num_comments = :num_comments,
plugin_data = :plugin_data, plugin_data = :plugin_data,
author = :author, author = :author,
lang = :lang lang = :lang
WHERE id = :id"); WHERE id = :id");
$params = [":title" => $entry_title, $params = [":title" => $entry_title,