fix includes order in update daemon

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 27b4c35d6462721f04f4aa03342475b2b162980c..6410709adf37882be1df4a7dc51bc663f4c13bd4 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,6 +1,7 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
-       set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+       set_include_path(get_include_path() . PATH_SEPARATOR .
+               dirname(__FILE__) . "/include");
 
        // This is an experimental multiprocess update daemon.
        // Some configurable variable may be found below.
@@ -19,8 +20,13 @@
        define('PURGE_INTERVAL', 3600); // seconds
        define('MAX_CHILD_RUNTIME', 600); // seconds
 
+       require_once "functions.php";
+       require_once "rssfuncs.php";
        require_once "sanity_check.php";
        require_once "config.php";
+       require_once "db.php";
+       require_once "db-prefs.php";
+       require_once "lib/magpierss/rss_fetch.inc";
 
        define('MAX_JOBS', 2);
        define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -29,11 +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 "lib/magpierss/rss_fetch.inc";
-
        $children = array();
        $ctimes = array();
 
@@ -52,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.");