X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=functions.php;h=9bd98795b646009b0126868ee3efd06ecf7218ab;hb=02008cb19ac99727889cca05c7eddfbeef30d684;hp=919cd926cfadc54af8776b222723cdd86ca03673;hpb=d4761137527576a249964eabaee66d36e62eb74f;p=tt-rss.git

diff --git a/functions.php b/functions.php
index 919cd926..9bd98795 100644
--- a/functions.php
+++ b/functions.php
@@ -468,12 +468,19 @@
 			_debug("update_rss_feed: start");
 		}
 
-		$result = db_query($link, "SELECT id,update_interval,auth_login,auth_pass,cache_images
-			FROM ttrss_feeds WHERE id = '$feed'");
+		if (DB_TYPE == "pgsql") {
+				$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started >= NOW() - INTERVAL '120 seconds')";
+			} else {
+				$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started >= DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+			}			
+
+		$result = db_query($link, "SELECT id,update_interval,auth_login,
+			auth_pass,cache_images
+			FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
 
 		if (db_num_rows($result) == 0) {
 			if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
-				_debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND");
+				_debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
 			}		
 			return;
 		}