daemon: assume child is dead if its lockfile is unlocked (refs #417)

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index c55a8aaaee319c5e2378f823e4687f54abb72366..80848bd0a4307d94a9d73e07a0d98f70b4268a8c 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-       set_include_path(get_include_path() . PATH_SEPARATOR . 
+       set_include_path(get_include_path() . PATH_SEPARATOR .
                dirname(__FILE__) . "/include");
 
        // This is an experimental multiprocess update daemon.
@@ -22,6 +22,11 @@
 
        require_once "sanity_check.php";
        require_once "config.php";
+       require_once "db.php";
+       require_once "db-prefs.php";
+       require_once "functions.php";
+       require_once "rssfuncs.php";
+       require_once "lib/magpierss/rss_fetch.inc";
 
        define('MAX_JOBS', 2);
        define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -30,12 +35,6 @@
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
-       require_once "db.php";
-       require_once "db-prefs.php";
-       require_once "functions.php";
-       require_once "rssfuncs.php";
-       require_once "lib/magpierss/rss_fetch.inc";
-
        $children = array();
        $ctimes = array();
 
@@ -54,6 +53,8 @@
                                        array_push($tmp, $pid);
                                } else {
                                        _debug("[reap_children] child $pid seems active but lockfile is unlocked.");
+                                       unset($ctimes[$pid]);
+
                                }
                        } else {
                                _debug("[reap_children] child $pid reaped.");