valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_rss_feed: transaction lock article processing

This commit is contained in:
Andrew Dolgov 2017-12-02 11:16:33 +03:00
parent 0567016b40
commit 0500e14cc2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/rssutils.php
View File

@ -591,19 +591,26 @@ class RSSUtils {
$tstart = time(); $tstart = time();
foreach ($items as $item) { foreach ($items as $item) {
$pdo->beginTransaction();
if ($_REQUEST['xdebug'] == 3) { if ($_REQUEST['xdebug'] == 3) {
print_r($item); print_r($item);
} }
if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) { if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
_debug("looks like there's too many articles to process at once, breaking out", $debug_enabled); _debug("looks like there's too many articles to process at once, breaking out", $debug_enabled);
$pdo->commit();
break; break;
} }
$entry_guid = strip_tags($item->get_id()); $entry_guid = strip_tags($item->get_id());
if (!$entry_guid) $entry_guid = strip_tags($item->get_link()); if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title()); if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
if (!$entry_guid) continue;
if (!$entry_guid) {
$pdo->commit();
continue;
}
$entry_guid = "$owner_uid,$entry_guid"; $entry_guid = "$owner_uid,$entry_guid";
@ -727,6 +734,7 @@ class RSSUtils {
WHERE id = ?"); WHERE id = ?");
$sth->execute([$base_entry_id]); $sth->execute([$base_entry_id]);
$pdo->commit();
continue; continue;
} }
@ -895,6 +903,7 @@ class RSSUtils {
$entry_ref_id = $ref_id; $entry_ref_id = $ref_id;
if (RSSUtils::find_article_filter($article_filters, "filter")) { if (RSSUtils::find_article_filter($article_filters, "filter")) {
$pdo->commit();
continue; continue;
} }
@ -1048,7 +1057,7 @@ class RSSUtils {
foreach ($enclosures as $enc) { foreach ($enclosures as $enc) {
$enc_url = $enc[0]; $enc_url = $enc[0];
$enc_type = $enc[1]; $enc_type = $enc[1];
$enc_dur = $enc[2]; $enc_dur = (int)$enc[2];
$enc_title = $enc[3]; $enc_title = $enc[3];
$enc_width = intval($enc[4]); $enc_width = intval($enc[4]);
$enc_height = intval($enc[5]); $enc_height = intval($enc[5]);
@ -1138,6 +1147,8 @@ class RSSUtils {
} }
_debug("article processed", $debug_enabled); _debug("article processed", $debug_enabled);
$pdo->commit();
} }
_debug("purging feed...", $debug_enabled); _debug("purging feed...", $debug_enabled);