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

Merge branch 'update-new-feeds-first-postgres' into 'master' 

Update new feeds first in postgres

As disscussed in the forum: https://tt-rss.org/forum/viewtopic.php?f=10&t=3644&p=21594#p21594, 

this fixes a bug where newly added feeds wouldn't be updated if the number of total feeds exceeded the DAEMON_FEED_LIMIT.

See merge request !22
This commit is contained in:
Andrew Dolgov 2015-12-31 16:58:08 +03:00
parent 85d067e837 98070db009
commit 7f4fff96b1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rssfuncs.php
View File

@ -134,6 +134,10 @@
$query_limit = ""; $query_limit = "";
if($limit) $query_limit = sprintf("LIMIT %d", $limit); if($limit) $query_limit = sprintf("LIMIT %d", $limit);
// Update the least recently updated feeds first
$query_order = "ORDER BY last_updated";
if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated $query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
FROM FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs ttrss_feeds, ttrss_users, ttrss_user_prefs
@ -144,7 +148,7 @@
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
$login_thresh_qpart $update_limit_qpart $login_thresh_qpart $update_limit_qpart
$updstart_thresh_qpart $updstart_thresh_qpart
ORDER BY last_updated $query_limit"; $query_order $query_limit";
// We search for feed needing update. // We search for feed needing update.
$result = db_query($query); $result = db_query($query);