servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

simplepie: fix feed-not-found bug; update daemon1 to some code from daemon2

This commit is contained in:
Andrew Dolgov 2008-01-25 04:28:14 +01:00
parent b086fed428
commit 740751d8cc
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions.php
View File

@ -543,7 +543,7 @@
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
$rss->set_timeout(20);
$rss->set_timeout(10);
$rss->set_feed_url($fetch_url);
$rss->set_output_encoding('UTF-8');

5
simplepie/simplepie.inc
View File

@ -7616,6 +7616,11 @@ class SimplePie_File
return $this->SimplePie_File($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
}
}
// No feed fount at error correction.
// according to http://simplepie.org/support/viewtopic.php?id=1430
else {
$this->success = false;
}
}
}
else

17
update_daemon_loop.php
View File

@ -155,8 +155,23 @@
$user_prefs_cache = array();
_debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
// Here is a little cache magic in order to minimize risk of double feed updates.
$feeds_to_update = array();
while ($line = db_fetch_assoc($result)) {
$feeds_to_update[$line['id']] = $line;
}
// We update the feed last update started date before anything else.
// There is no lag due to feed contents downloads
// It prevent an other process to update the same feed (for exemple, forced update by user).
$feed_ids = array_keys($feeds_to_update);
if($feed_ids) {
db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE id IN (%s)", implode(',', $feed_ids)));
}
while ($line = array_pop($feeds_to_update)) {
_debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);