X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=ce6a3ee9c33d63f518980e008f8f8a78a0ad10cf;hb=a5ff2e77257f6884896a40c9d3303b768c49302f;hp=650b101ddcc8b6498d09d15552261d34d26348b2;hpb=6a69e61ffbd1fe8ff348adc84fe32c7b580c9e75;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
old mode 100644
new mode 100755
index 650b101d..ce6a3ee9
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,66 +1,211 @@
 #!/usr/bin/php
 <?php
-	// This is an experimental multiprocess update daemon
-	// It consists of the master server (this file) and
-	// client batch script (update_daemon2_client.php) which
-	// should only be run by the server process
+	// This is an experimental multiprocess update daemon.
+	// Some configurable variable may be found below.
+
+	// define('DEFAULT_ERROR_LEVEL', E_ALL);
+	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
 
 	declare(ticks = 1);
 
+	define('DISABLE_SESSIONS', true);
+
+	require_once "version.php";
+
+	if (strpos(VERSION, ".99") !== false || getenv('DAEMON_XDEBUG')) {
+		define('DAEMON_EXTENDED_DEBUG', true);
+	}
+
+	define('PURGE_INTERVAL', 3600); // seconds
+	define('MAX_CHILD_RUNTIME', 600); // seconds
+
+	require_once "sanity_check.php";
 	require_once "config.php";
-	require_once "functions.php";
 
 	define('MAX_JOBS', 2);
-	define('CLIENT_PROCESS', './update_daemon2_client.php SRV_RUN_OK');
 	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
 
-	$running_jobs = 0;
+	if (!function_exists('pcntl_fork')) {
+		die("error: This script requires PHP compiled with PCNTL module.\n");
+	}
+
+	if (!ENABLE_UPDATE_DAEMON) {
+		die("error: Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
+	}
+	
+	require_once "db.php";
+	require_once "db-prefs.php";
+	require_once "functions.php";
+	require_once "lib/magpierss/rss_fetch.inc";
+
+	error_reporting(DEFAULT_ERROR_LEVEL);
+
+	$children = array();
+	$ctimes = array();
+
 	$last_checkpoint = -1;
 
+	function reap_children() {
+		global $children;
+		global $ctimes;
+
+		$tmp = array();
+
+		foreach ($children as $pid) {
+			if (pcntl_waitpid($pid, $status, WNOHANG) != $pid) {
+				array_push($tmp, $pid);
+			} else {
+				_debug("[SIGCHLD] child $pid reaped.");
+				unset($ctimes[$pid]);
+			}
+		}
+
+		$children = $tmp;
+
+		return count($tmp);
+	}
+
+	function check_ctimes() {
+		global $ctimes;
+		
+		foreach (array_keys($ctimes) as $pid) {
+			$started = $ctimes[$pid];
+
+			if (time() - $started > MAX_CHILD_RUNTIME) {
+				_debug("[MASTER] child process $pid seems to be stuck, aborting...");
+				posix_kill($pid, SIGINT);
+			}
+		}
+	}
+
 	function sigchld_handler($signal) {
-		global $running_jobs;
-		if ($running_jobs > 0) $running_jobs--;
-		print posix_getpid() . ": SIGCHLD received, jobs left: $running_jobs\n";
+		$running_jobs = reap_children();
+
+		_debug("[SIGCHLD] jobs left: $running_jobs");
+
 		pcntl_waitpid(-1, $status, WNOHANG);
 	}
 
 	function sigint_handler() {
 		unlink(LOCK_DIRECTORY . "/update_daemon.lock");
-		die("Received SIGINT. Exiting.\n");
+		die("[SIGINT] removing lockfile and exiting.\n");
 	}
 
 	pcntl_signal(SIGCHLD, 'sigchld_handler');
-	pcntl_signal(SIGINT, 'sigint_handler');
-
-	$lock_handle = make_lockfile("update_daemon.lock");
 
-	if (!$lock_handle) {
-		die("error: Can't create lockfile ($lock_filename). ".
+	if (file_is_locked("update_daemon.lock")) {
+		die("error: Can't create lockfile. ".
 			"Maybe another daemon is already running.\n");
 	}
 
+	if (!pcntl_fork()) {
+		pcntl_signal(SIGINT, 'sigint_handler');
+
+		// 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");
+		}
+
+		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;
+	}
+
+	db_close($link);
+
 	while (true) {
 
+		// Since sleep is interupted by SIGCHLD, we need another way to
+		// respect the SPAWN_INTERVAL
 		$next_spawn = $last_checkpoint + SPAWN_INTERVAL - time();
 
-		print "[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec\n";
+		if ($next_spawn % 10 == 0) {
+			$running_jobs = count($children);
+			_debug("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
+		}
 
 		if ($last_checkpoint + SPAWN_INTERVAL < time()) {
 
-			for ($j = $running_jobs; $j < MAX_JOBS; $j++) {
-				print "[MASTER] spawning client $j...";
+			check_ctimes();
+			reap_children();
+
+			for ($j = count($children); $j < MAX_JOBS; $j++) {
 				$pid = pcntl_fork();
 				if ($pid == -1) {
 					die("fork failed!\n");
 				} else if ($pid) {
-					$running_jobs++;
-					print "OK [$running_jobs]\n";
+					_debug("[MASTER] spawned client $j [PID:$pid]...");
+					array_push($children, $pid);
+					$ctimes[$pid] = time();
 				} else {
 					pcntl_signal(SIGCHLD, SIG_IGN);
 					pcntl_signal(SIGINT, SIG_DFL);
-					passthru(CLIENT_PROCESS);
+
+					// ****** Updating RSS code *******
+					// Only run in fork process.
+
+					$start_timestamp = time();
+
+					$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);
+
+					// We disable stamp file, since it is of no use in a multiprocess update.
+					// not really, tho for the time being -fox
+					if (!make_stampfile('update_daemon.stamp')) {
+						print "warning: unable to create stampfile";
+					}	
+
+					// FIXME : $last_purge is of no use in a multiprocess update.
+					// FIXME : We ALWAYS purge old posts.
+					//_debug("Purging old posts (random 30 feeds)...");
+					//global_purge_old_posts($link, true, 30);
+
+					// Call to the feed batch update function 
+					// or regenerate feedbrowser cache
+
+					if (rand(0,100) > 50) {
+						update_daemon_common($link);
+					} else {
+						$count = update_feedbrowser_cache($link);
+						_debug("Finished, $count feeds processed.");
+					}
+
+					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
+ 
+					db_close($link);
+
+					// We are in a fork.
+					// We wait a little before exiting to avoid to be faster than our parent process.
+					sleep(1);
+					// We exit in order to avoid fork bombing.
 					exit(0);
 				}
+
+				// We wait a little time before the next fork, in order to let the first fork
+				// mark the feeds it update :
+				sleep(1);
 			}
 			$last_checkpoint = time();
 		}