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

daemon: do not schedule user-disabled feeds (2)

This commit is contained in:
Andrew Dolgov 2013-03-31 14:36:06 +04:00
parent cd7ebb39e4
commit ee0542ce28
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/rssfuncs.php
View File

@ -77,7 +77,7 @@
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0 ttrss_feeds.update_interval = 0
AND CAST(ttrss_user_prefs.value AS INTEGER) != -1 AND ttrss_user_prefs.value != '-1'
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL) AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
) OR ( ) OR (
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
@ -87,7 +87,7 @@
} else { } else {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0 ttrss_feeds.update_interval = 0
AND CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) != -1 AND ttrss_user_prefs.value != '-1'
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE) AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
) OR ( ) OR (
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
@ -160,10 +160,13 @@
// since we have the data cached, we can deal with other feeds with the same url // since we have the data cached, we can deal with other feeds with the same url
$tmp_result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id,last_updated $tmp_result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id,last_updated
FROM ttrss_feeds, ttrss_users WHERE FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
ttrss_users.id = ttrss_feeds.owner_uid AND ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
ttrss_users.id = ttrss_user_prefs.owner_uid AND
ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
feed_url = '".db_escape_string($link, $feed)."' AND feed_url = '".db_escape_string($link, $feed)."' AND
ttrss_feeds.update_interval != -1 (ttrss_feeds.update_interval > 0 OR
ttrss_user_prefs.value != '-1')
$login_thresh_qpart $login_thresh_qpart
ORDER BY feed_url $query_limit"); ORDER BY feed_url $query_limit");

2
update_daemon2.php
View File

@ -249,7 +249,7 @@
$nf = 0; $nf = 0;
_debug("Waiting before update.."); _debug("Waiting before update..");
sleep(rand(5,15)); sleep(rand(1,15));
$nf = update_daemon_common($link); $nf = update_daemon_common($link);
if (rand(0,100) > 50) { if (rand(0,100) > 50) {