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 37c04e28fe06ec920afcde5f3e594834a06394e1..689d1aab27580161e3c7babcec74a706ac009c3c 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -9,6 +9,7 @@
        declare(ticks = 1);
 
        define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
+       define('SIMPLEPIE_CACHE_DIR',   '/var/tmp/simplepie-ttrss-cache-daemon');
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
@@ -34,17 +35,16 @@
        error_reporting(DEFAULT_ERROR_LEVEL);
 
        function sigint_handler() {
-               unlink("update_daemon.lock");
+               unlink(LOCK_DIRECTORY . "/update_daemon.lock");
                die("Received SIGINT. Exiting.\n");
        }
 
-//     function sigalrm_handler() {
-//             print "SIGALARM\n";
-//             pcntl_alarm(3);
-//     }
+       function sigalrm_handler() {
+               die("received SIGALRM, hang in feed update?\n");
+       }
 
        pcntl_signal(SIGINT, sigint_handler);
-//     pcntl_signal(SIGALRM, sigalrm_handler);
+       pcntl_signal(SIGALRM, sigalrm_handler);
 
        $lock_handle = make_lockfile("update_daemon.lock");
 
@@ -66,12 +66,22 @@
        if (DB_TYPE == "pgsql") {
                pg_query("set client_encoding = 'utf-8'");
                pg_set_client_encoding("UNICODE");
+       } else {
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        $last_purge = 0;
 
        while (true) {
 
+               if (!make_stampfile('update_daemon.stamp')) {
+                       print "error: unable to create stampfile";
+                       die;
+               }
+
                if (time() - $last_purge > PURGE_INTERVAL) {
                        _debug("Purging old posts (random 30 feeds)...");
                        global_purge_old_posts($link, true, 30);
@@ -116,14 +126,27 @@
                        $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 
-                       ORDER BY $random_qpart DESC");
+                               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();
 
@@ -148,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));
@@ -158,7 +181,12 @@
 
                                _debug("Updating...");
 
+                               pcntl_alarm(300);
+
                                update_rss_feed($link, $line["feed_url"], $line["id"], true);   
+
+                               pcntl_alarm(0);
+
                                sleep(1); // prevent flood (FIXME make this an option?)
                        } else {
                                _debug("Update not needed.");