X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=update_daemon2.php;h=007d6286f7ae80e6a877f6c343b560c1134a3f98;hp=193a9c1555e52c66da14262b8235b72e8954a840;hb=e52034b4bcce994312ce2af31be0a46a70172691;hpb=0e6bdaeff04a9749c4a964b042459a8d2b124c9d

diff --git a/update_daemon2.php b/update_daemon2.php
old mode 100755
new mode 100644
index 193a9c15..007d6286
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,27 +9,34 @@
 	define('DISABLE_SESSIONS', true);
 
 	require_once "version.php";
-	require_once "config.php";
 	require_once "autoload.php";
 	require_once "functions.php";
+	require_once "config.php";
 
 	// defaults
 	define_default('PURGE_INTERVAL', 3600); // seconds
-	define_default('MAX_CHILD_RUNTIME', 600); // seconds
+	define_default('MAX_CHILD_RUNTIME', 1800); // seconds
 	define_default('MAX_JOBS', 2);
 	define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
-	define_default('DAEMON_FEED_LIMIT', 250);
 
-	require_once "rssfuncs.php";
 	require_once "sanity_check.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
 
-
 	if (!function_exists('pcntl_fork')) {
 		die("error: This script requires PHP compiled with PCNTL module.\n");
 	}
 
+	$options = getopt("");
+
+	if (!is_array($options)) {
+		die("error: getopt() failed. ".
+			"Most probably you are using PHP CGI to run this script ".
+			"instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+			"additional information.\n");
+	}
+
+
 	$master_handlers_installed = false;
 
 	$children = array();
@@ -37,6 +44,9 @@
 
 	$last_checkpoint = -1;
 
+	/**
+	 * @SuppressWarnings(unused)
+	 */
 	function reap_children() {
 		global $children;
 		global $ctimes;
@@ -49,12 +59,12 @@
 				if (file_is_locked("update_daemon-$pid.lock")) {
 					array_push($tmp, $pid);
 				} else {
-					_debug("[reap_children] child $pid seems active but lockfile is unlocked.");
+					Debug::log("[reap_children] child $pid seems active but lockfile is unlocked.");
 					unset($ctimes[$pid]);
 
 				}
 			} else {
-				_debug("[reap_children] child $pid reaped.");
+				Debug::log("[reap_children] child $pid reaped.");
 				unset($ctimes[$pid]);
 			}
 		}
@@ -71,16 +81,19 @@
 			$started = $ctimes[$pid];
 
 			if (time() - $started > MAX_CHILD_RUNTIME) {
-				_debug("[MASTER] child process $pid seems to be stuck, aborting...");
+				Debug::log("[MASTER] child process $pid seems to be stuck, aborting...");
 				posix_kill($pid, SIGKILL);
 			}
 		}
 	}
 
+	/**
+	* @SuppressWarnings(unused)
+ 	*/
 	function sigchld_handler($signal) {
 		$running_jobs = reap_children();
 
-		_debug("[SIGCHLD] jobs left: $running_jobs");
+		Debug::log("[SIGCHLD] jobs left: $running_jobs");
 
 		pcntl_waitpid(-1, $status, WNOHANG);
 	}
@@ -88,7 +101,7 @@
 	function shutdown($caller_pid) {
 		if ($caller_pid == posix_getpid()) {
 			if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
-				_debug("removing lockfile (master)...");
+				Debug::log("removing lockfile (master)...");
 				unlink(LOCK_DIRECTORY . "/update_daemon.lock");
 			}
 		}
@@ -98,19 +111,19 @@
 		$pid = posix_getpid();
 
 		if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
-			_debug("removing lockfile ($pid)...");
+			Debug::log("removing lockfile ($pid)...");
 			unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
 		}
 	}
 
 	function sigint_handler() {
-		_debug("[MASTER] SIG_INT received.\n");
+		Debug::log("[MASTER] SIG_INT received.\n");
 		shutdown(posix_getpid());
 		die;
 	}
 
 	function task_sigint_handler() {
-		_debug("[TASK] SIG_INT received.\n");
+		Debug::log("[TASK] SIG_INT received.\n");
 		task_shutdown();
 		die;
 	}
@@ -118,6 +131,7 @@
 	pcntl_signal(SIGCHLD, 'sigchld_handler');
 
 	$longopts = array("log:",
+			"log-level:",
 			"tasks:",
 			"interval:",
 			"quiet",
@@ -129,6 +143,7 @@
 		print "Tiny Tiny RSS update daemon.\n\n";
 		print "Options:\n";
 		print "  --log FILE           - log messages to FILE\n";
+        print "  --log-level N        - log verbosity level\n";
 		print "  --tasks N            - amount of update tasks to spawn\n";
 		print "                         default: " . MAX_JOBS . "\n";
 		print "  --interval N         - task spawn interval\n";
@@ -137,26 +152,35 @@
 		return;
 	}
 
-	define('QUIET', isset($options['quiet']));
+    Debug::set_enabled(true);
+    Debug::set_quiet(isset($options['quiet']));
+
+    if (isset($options["log-level"])) {
+        Debug::set_loglevel((int)$options["log-level"]);
+    }
+
+    if (isset($options["log"])) {
+        Debug::set_logfile($options["log"]);
+        Debug::log("Logging to " . $options["log"]);
+    }
 
 	if (isset($options["tasks"])) {
-		_debug("Set to spawn " . $options["tasks"] . " children.");
+		Debug::log("Set to spawn " . $options["tasks"] . " children.");
 		$max_jobs = $options["tasks"];
 	} else {
 		$max_jobs = MAX_JOBS;
 	}
 
 	if (isset($options["interval"])) {
-		_debug("Spawn interval: " . $options["interval"] . " seconds.");
+		Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
 		$spawn_interval = $options["interval"];
 	} else {
 		$spawn_interval = SPAWN_INTERVAL;
 	}
 
-	if (isset($options["log"])) {
-		_debug("Logging to " . $options["log"]);
-		define('LOGFILE', $options["log"]);
-	}
+	// let's enforce a minimum spawn interval as to not forkbomb the host
+	$spawn_interval = max(60, $spawn_interval);
+	Debug::log("Spawn interval: $spawn_interval sec");
 
 	if (file_is_locked("update_daemon.lock")) {
 		die("error: Can't create lockfile. ".
@@ -171,14 +195,15 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	init_plugins();
-
 	$schema_version = get_schema_version();
 
 	if ($schema_version != SCHEMA_VERSION) {
 		die("Schema version is wrong, please upgrade the database.\n");
 	}
 
+	// Protip: children close shared database handle when terminating, it's a bad idea to
+	// do database stuff on main process from now on.
+
 	while (true) {
 
 		// Since sleep is interupted by SIGCHLD, we need another way to
@@ -187,21 +212,10 @@
 
 		if ($next_spawn % 60 == 0) {
 			$running_jobs = count($children);
-			_debug("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
+			Debug::log("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
 		}
 
 		if ($last_checkpoint + $spawn_interval < time()) {
-
-			/* Check if schema version changed */
-
-			$test_schema_version = get_schema_version();
-
-			if ($test_schema_version != $schema_version) {
-				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
-				echo "Schema version changed while we were running, bailing out\n";
-				exit(100);
-			}
-
 			check_ctimes();
 			reap_children();
 
@@ -212,13 +226,14 @@
 				} else if ($pid) {
 
 					if (!$master_handlers_installed) {
-						_debug("[MASTER] installing shutdown handlers");
+						Debug::log("[MASTER] installing shutdown handlers");
 						pcntl_signal(SIGINT, 'sigint_handler');
+						pcntl_signal(SIGTERM, 'sigint_handler');
 						register_shutdown_function('shutdown', posix_getpid());
 						$master_handlers_installed = true;
 					}
 
-					_debug("[MASTER] spawned client $j [PID:$pid]...");
+					Debug::log("[MASTER] spawned client $j [PID:$pid]...");
 					array_push($children, $pid);
 					$ctimes[$pid] = time();
 				} else {
@@ -228,10 +243,11 @@
 					register_shutdown_function('task_shutdown');
 
 					$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+					$log = function_exists("flock") && isset($options['log']) ? '--log '.$options['log'] : '';
 
 					$my_pid = posix_getpid();
 
-					passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet --task $j --pidlock $my_pid");
+					passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
 					sleep(1);