X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=f2a962629d7d1b7f92c92bb31ea7183635237421;hb=7c9f819f1e1e7e50c76be3a1cf25ec6c99c26a03;hp=6b9d9246ff692d217dcc1cd24991b02a711cf5a2;hpb=2c08214a7f4dd693cb401714412b7a1ad635ed41;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 6b9d9246..f2a96262 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,9 +1,7 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
-
-	// This is an experimental multiprocess update daemon.
-	// Some configurable variable may be found below.
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	declare(ticks = 1);
 	chdir(dirname(__FILE__));
@@ -19,8 +17,12 @@
 	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";
 
 	define('MAX_JOBS', 2);
 	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -29,12 +31,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();
 
@@ -53,6 +49,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.");
@@ -115,7 +113,7 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	if (!pcntl_fork()) {
+	/* if (!pcntl_fork()) {
 		pcntl_signal(SIGINT, 'sigint_handler');
 		register_shutdown_function('shutdown');
 
@@ -128,7 +126,7 @@
 		}
 
 		while (true) { sleep(100); }
-	}
+	} */
 
 	// Testing database connection.
 	// It is unnecessary to start the fork loop if database is not ok.
@@ -208,9 +206,8 @@
 
 						_debug("Cleaned $rc cached tags.");
 
-						_debug("Updating linked feeds...");
-						get_linked_feeds($link);
-
+						global $pluginhost;
+						$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 					}
 
 					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");