xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests 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
pull/831/head
Alexandre Alapetite 10 years ago
parent a5a3789b2c
commit 84ea636d2d
1 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      app/Controllers/feedController.php

8
app/Controllers/feedController.php
Unescape View File

@ -300,8 +300,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$updated_feeds = 0; $updated_feeds = 0;
$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0; $is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
foreach ($feeds as $feed) { foreach ($feeds as $feed) {
$url = $feed->url(); //For detection of HTTP 301
$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled(); $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 continue; //When PubSubHubbub is used, do not pull refresh so often
} }
@ -310,7 +315,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue; continue;
} }
$url = $feed->url(); //For detection of HTTP 301
try { try {
if ($simplePiePush) { if ($simplePiePush) {
$feed->loadEntries($simplePiePush); //Used by PubSubHubbub $feed->loadEntries($simplePiePush); //Used by PubSubHubbub

Write Preview
Loading…
Cancel
Save