update_daemon2: print idle notice once per 10 seconds

[tt-rss.git] / update_daemon.php

diff --git a/update_daemon.php b/update_daemon.php
index 75229f667f3354de090671a85432fc0dca84f2fd..689d1aab27580161e3c7babcec74a706ac009c3c 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -35,7 +35,7 @@
        error_reporting(DEFAULT_ERROR_LEVEL);
 
        function sigint_handler() {
-               unlink("update_daemon.lock");
+               unlink(LOCK_DIRECTORY . "/update_daemon.lock");
                die("Received SIGINT. Exiting.\n");
        }
 
@@ -126,13 +126,26 @@
                        $login_thresh_qpart = "";
                }
 
+               if (DB_TYPE == "pgsql") {
+                       $update_limit_qpart = "AND ttrss_feeds.last_updated < NOW() - INTERVAL '".(DAEMON_SLEEP_INTERVAL*2)." seconds'";
+               } else {
+                       $update_limit_qpart = "AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ".(DAEMON_SLEEP_INTERVAL*2)." SECOND)";
+               }
+
+               if (DB_TYPE == "pgsql") {
+                               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
+                       } else {
+                               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+                       }                       
+
                $result = db_query($link, "SELECT feed_url,ttrss_feeds.id,owner_uid,
                                SUBSTRING(last_updated,1,19) AS last_updated,
                                update_interval 
                        FROM 
                                ttrss_feeds,ttrss_users 
                        WHERE 
-                               ttrss_users.id = owner_uid $login_thresh_qpart 
+                               ttrss_users.id = owner_uid $login_thresh_qpart $update_limit_qpart 
+                               $updstart_thresh_qpart
                        ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
 
                $user_prefs_cache = array();
@@ -158,7 +171,7 @@
                                continue; 
                        }
        
-                       _debug("Feed: " . $line["feed_url"]);
+                       _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
 
 //                     _debug(sprintf("\tLU: %d, INTL: %d, UID: %d) ", 
 //                             time() - strtotime($line["last_updated"]), $upd_intl*60, $user_id));