mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 08:14:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

PubSubHubbub bug skip pull

Browse Source 
Do not pull refresh feeds that are PubSubHubbub too often during cron
refresh.
And more debugging info during the test phase.
https://github.com/FreshRSS/FreshRSS/pull/831
This commit is contained in:
Alexandre Alapetite
2015-05-16 23:44:36 +02:00
parent a5a3789b2c
commit 84ea636d2d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/feedController.php
View File

@@ -300,8 +300,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$updated_feeds = 0;
$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
foreach ($feeds as $feed) {
$url = $feed->url(); //For detection of HTTP 301
$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
if ((!$simplePiePush) && (!$id) && (!$force) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
Minz_Log::debug($text);
file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
continue; //When PubSubHubbub is used, do not pull refresh so often
}
@@ -310,7 +315,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue;
}
$url = $feed->url(); //For detection of HTTP 301
try {
if ($simplePiePush) {
$feed->loadEntries($simplePiePush); //Used by PubSubHubbub