X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=80848bd0a4307d94a9d73e07a0d98f70b4268a8c;hb=125ab8dbf7387bf57f0c3285fc3e7a8ce2013aaa;hp=6ccdbcb100e5a7fc2afd614563a1098159b92e76;hpb=9b27cec8c01ff231085bc2045d196ace85e299d9;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 6ccdbcb1..80848bd0 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,5 +1,8 @@
 #!/usr/bin/php
 <?php
+	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,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);
@@ -27,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();
 
@@ -50,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.");
@@ -131,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);
 
@@ -188,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
@@ -219,6 +210,9 @@
 
 						_debug("Cleaned $rc cached tags.");
 
+						_debug("Updating linked feeds...");
+						get_linked_feeds($link);
+
 					}
 
 					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");