default headline sort order by date_entered instead of updated

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 9747d523354e95ee7c6ecde839051d8550090627..1b9e57638eecfafe2b55858b5bbdb44d81db9001 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -23,8 +23,6 @@
        require_once "config.php";
 
        define('MAX_JOBS', 2);
-       define('SPAWN_INTERVAL', 1);
-
        define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
 
        if (!function_exists('pcntl_fork')) {
@@ -49,6 +47,7 @@
 
        function reap_children() {
                global $children;
+               global $ctimes;
 
                $tmp = array();
 
@@ -74,7 +73,7 @@
 
                        if (time() - $started > MAX_CHILD_RUNTIME) {
                                _debug("[MASTER] child process $pid seems to be stuck, aborting...");
-                               posix_kill($pid, SIGINT);
+                               posix_kill($pid, SIGKILL);
                        }
                }
        }
@@ -178,11 +177,6 @@
                                                print "warning: unable to create stampfile";
                                        }       
 
-                                       // FIXME : $last_purge is of no use in a multiprocess update.
-                                       // FIXME : We ALWAYS purge old posts.
-                                       //_debug("Purging old posts (random 30 feeds)...");
-                                       //global_purge_old_posts($link, true, 30);
-
                                        // Call to the feed batch update function 
                                        // or regenerate feedbrowser cache