X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=6410709adf37882be1df4a7dc51bc663f4c13bd4;hb=51cc387347668e98b1b8e6c6053581a2affc5fa6;hp=06271de85187dd72b635257eafe3525ce9c46a89;hpb=107d0cf39e3801547a9a86b32762b772b25f6953;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 06271de8..6410709a 100755
--- 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.");
@@ -133,13 +136,7 @@
 	// It is unnecessary to start the fork loop if database is not ok.
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!$link) {
-		if (DB_TYPE == "mysql") {
-			print mysql_error();
-		}
-		// PG seems to display its own errors just fine by default.
-		return;
-	}
+	if (!init_connection($link)) return;
 
 	db_close($link);
 
@@ -190,15 +187,7 @@
 
 					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-					if (!$link) {
-						if (DB_TYPE == "mysql") {
-							print mysql_error();
-						}
-						// PG seems to display its own errors just fine by default.
-						return;
-					}
-
-					init_connection($link);
+					if (!init_connection($link)) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox