api, also hide uncategorized if empty

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 7062e8e354cd9bc08a205566a742b18ccf8de72e..fa64b302d8464aee7836fc0db5112dba24f01a10 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -121,6 +121,7 @@
        $longopts = array("log:",
                        "tasks:",
                        "interval",
+                       "quiet",
                        "help");
 
        $options = getopt("", $longopts);
@@ -185,7 +186,7 @@
                // respect the spawn interval
                $next_spawn = $last_checkpoint + $spawn_interval - time();
 
-               if ($next_spawn % 10 == 0) {
+               if ($next_spawn % 60 == 0) {
                        $running_jobs = count($children);
                        _debug("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
                }
@@ -239,15 +240,19 @@
                                        // We disable stamp file, since it is of no use in a multiprocess update.
                                        // not really, tho for the time being -fox
                                        if (!make_stampfile('update_daemon.stamp')) {
-                                               die("error: unable to create stampfile\n");
+                                               _debug("warning: unable to create stampfile\n");
                                        }
 
                                        // Call to the feed batch update function
-                                       // or regenerate feedbrowser cache
+                                       // and maybe regenerate feedbrowser cache
 
-                                       if (rand(0,100) > 30) {
-                                               update_daemon_common($link);
-                                       } else {
+                                       $nf = 0;
+
+                                       _debug("Waiting before update [$j]..");
+                                       sleep($j*5);
+                                       $nf = update_daemon_common($link);
+
+                                       if (rand(0,100) > 50) {
                                                $count = update_feedbrowser_cache($link);
                                                _debug("Feedbrowser updated, $count feeds processed.");
 
@@ -263,6 +268,10 @@
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
 
+                                       if ($nf > 0) {
+                                               _debug("Feeds processed: $nf; feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
+                                       }
+
                                        db_close($link);
 
                                        // We are in a fork.
@@ -274,10 +283,6 @@
                                        // We exit in order to avoid fork bombing.
                                        exit(0);
                                }
-
-                               // We wait a little time before the next fork, in order to let the first fork
-                               // mark the feeds it update :
-                               sleep(1);
                        }
                        $last_checkpoint = time();
                }