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

diff --git a/update_daemon2.php b/update_daemon2.php
index 6ccdbcb1..c87f0c10 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__));
@@ -14,23 +14,24 @@
 		define('DAEMON_EXTENDED_DEBUG', true);
 	}
 
-	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";
 
+	// defaults
+	define('PURGE_INTERVAL', 3600); // seconds
+	define('MAX_CHILD_RUNTIME', 600); // seconds
 	define('MAX_JOBS', 2);
-	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
+	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
 
 	if (!function_exists('pcntl_fork')) {
 		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";
+	$master_handlers_installed = false;
 
 	$children = array();
 	$ctimes = array();
@@ -50,6 +51,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.");
@@ -83,85 +86,144 @@
 		pcntl_waitpid(-1, $status, WNOHANG);
 	}
 
-	function shutdown() {
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock"))
-			unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+	function shutdown($caller_pid) {
+		if ($caller_pid == posix_getpid()) {
+			if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+				_debug("removing lockfile (master)...");
+				unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+			}
+		}
 	}
 
 	function task_shutdown() {
 		$pid = posix_getpid();
 
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock"))
+		if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+			_debug("removing lockfile ($pid)...");
 			unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+		}
 	}
 
 	function sigint_handler() {
-		shutdown();
-		die("[SIGINT] removing lockfile and exiting.\n");
+		_debug("[MASTER] SIG_INT received.\n");
+		shutdown(posix_getpid());
+		die;
 	}
 
 	function task_sigint_handler() {
+		_debug("[TASK] SIG_INT received.\n");
 		task_shutdown();
-		die("[SIGINT] removing lockfile and exiting.\n");
+		die;
 	}
 
 	pcntl_signal(SIGCHLD, 'sigchld_handler');
 
+	$longopts = array("log:",
+			"tasks:",
+			"interval",
+			"quiet",
+			"help");
+
+	$options = getopt("", $longopts);
+
+	if (isset($options["help"]) ) {
+		print "Tiny Tiny RSS update daemon.\n\n";
+		print "Options:\n";
+		print "  --log FILE           - log messages to FILE\n";
+		print "  --tasks N            - amount of update tasks to spawn\n";
+		print "                         default: " . MAX_JOBS . "\n";
+		print "  --interval N         - task spawn interval\n";
+		print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+		print "  --quiet              - don't output messages to stdout\n";
+		return;
+	}
+
+	define('QUIET', isset($options['quiet']));
+
+	if (isset($options["tasks"])) {
+		_debug("Set to spawn " . $options["tasks"] . " children.");
+		$max_jobs = $option["tasks"];
+	} else {
+		$max_jobs = MAX_JOBS;
+	}
+
+	if (isset($options["interval"])) {
+		_debug("Spawn interval: " . $options["interval"] . " seconds.");
+		$spawn_interval = $option["interval"];
+	} else {
+		$spawn_interval = SPAWN_INTERVAL;
+	}
+
+	if (isset($options["log"])) {
+		_debug("Logging to " . $options["log"]);
+		define('LOGFILE', $options["log"]);
+	}
+
 	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');
-		register_shutdown_function('shutdown');
-
-		// 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");
-		}
+	// Try to lock a file in order to avoid concurrent update.
+	$lock_handle = make_lockfile("update_daemon.lock");
 
-		while (true) { sleep(100); }
+	if (!$lock_handle) {
+		die("error: Can't create lockfile. ".
+			"Maybe another daemon is already running.\n");
 	}
 
 	// 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)) die("Can't initialize db connection.\n");
+
+	$schema_version = get_schema_version($link);
 
 	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();
+		// respect the spawn interval
+		$next_spawn = $last_checkpoint + $spawn_interval - time();
 
-		if ($next_spawn % 10 == 0) {
+		if ($next_spawn % 60 == 0) {
 			$running_jobs = count($children);
 			_debug("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
 		}
 
-		if ($last_checkpoint + SPAWN_INTERVAL < time()) {
+		if ($last_checkpoint + $spawn_interval < time()) {
+
+			/* Check if schema version changed */
+
+			$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+			if (!init_connection($link)) die("Can't initialize db connection.\n");
+			$test_schema_version = get_schema_version($link);
+			db_close($link);
+
+			if ($test_schema_version != $schema_version) {
+				_debug("Expected schema version: $schema_version, got: $test_schema_version");
+				_debug("Schema version changed while we were running, bailing out");
+				exit(100);
+			}
 
 			check_ctimes();
 			reap_children();
 
-			for ($j = count($children); $j < MAX_JOBS; $j++) {
+			for ($j = count($children); $j < $max_jobs; $j++) {
 				$pid = pcntl_fork();
 				if ($pid == -1) {
 					die("fork failed!\n");
 				} else if ($pid) {
+
+					if (!$master_handlers_installed) {
+						_debug("[MASTER] installing shutdown handlers");
+						pcntl_signal(SIGINT, 'sigint_handler');
+						register_shutdown_function('shutdown', posix_getpid());
+						$master_handlers_installed = true;
+					}
+
 					_debug("[MASTER] spawned client $j [PID:$pid]...");
 					array_push($children, $pid);
 					$ctimes[$pid] = time();
@@ -188,28 +250,24 @@
 
 					$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
 					if (!make_stampfile('update_daemon.stamp')) {
-						print "warning: unable to create stampfile";
+						_debug("warning: unable to create stampfile\n");
 					}
 
 					// Call to the feed batch update function
-					// or regenerate feedbrowser cache
+					// and maybe regenerate feedbrowser cache
+
+					$nf = 0;
+
+					_debug("Waiting before update [$j]..");
+					sleep($j*5);
+					$nf = update_daemon_common($link);
 
-					if (rand(0,100) > 30) {
-						update_daemon_common($link);
-					} else {
+					if (rand(0,100) > 50) {
 						$count = update_feedbrowser_cache($link);
 						_debug("Feedbrowser updated, $count feeds processed.");
 
@@ -219,10 +277,16 @@
 
 						_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)");
 
+					if ($nf > 0) {
+						_debug("Feeds processed: $nf; feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
+					}
+
 					db_close($link);
 
 					// We are in a fork.
@@ -234,10 +298,6 @@
 					// 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();
 		}