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

diff --git a/update_daemon2.php b/update_daemon2.php
index 6ccdbcb1..cee61bb6 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,7 +1,7 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
-	// 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__));
@@ -17,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);
@@ -27,11 +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 "lib/magpierss/rss_fetch.inc";
-
 	$children = array();
 	$ctimes = array();
 
@@ -50,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.");
@@ -112,7 +113,15 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	if (!pcntl_fork()) {
+	// Try to lock a file in order to avoid concurrent update.
+	$lock_handle = make_lockfile("update_daemon.lock");
+
+	if (!$lock_handle) {
+		die("error: Can't create lockfile. ".
+			"Maybe another daemon is already running.\n");
+	}
+
+	/* if (!pcntl_fork()) {
 		pcntl_signal(SIGINT, 'sigint_handler');
 		register_shutdown_function('shutdown');
 
@@ -125,19 +134,13 @@
 		}
 
 		while (true) { sleep(100); }
-	}
+	} */
 
 	// Testing database connection.
 	// 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 +191,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 +214,8 @@
 
 						_debug("Cleaned $rc cached tags.");
 
+						global $pluginhost;
+						$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 					}
 
 					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");