X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=af29ac18f86e0987f23cc365324cdaadadd63010;hb=22366ccc5b4b82f6867ded767b318b1ac9978270;hp=81734bc3c6fc7800959380e6099f82812b1addd1;hpb=bd8ae98bde2320668972fd40e60f1866e86214dc;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 81734bc3..af29ac18 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -12,7 +12,6 @@
 	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "config.php";
-	require_once "rssfuncs.php";
 
 	// defaults
 	define_default('PURGE_INTERVAL', 3600); // seconds
@@ -24,11 +23,20 @@
 	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();
@@ -36,6 +44,9 @@
 
 	$last_checkpoint = -1;
 
+	/**
+	 * @SuppressWarnings(unused)
+	 */
 	function reap_children() {
 		global $children;
 		global $ctimes;
@@ -76,6 +87,9 @@
 		}
 	}
 
+	/**
+	* @SuppressWarnings(unused)
+ 	*/
 	function sigchld_handler($signal) {
 		$running_jobs = reap_children();
 
@@ -152,6 +166,10 @@
 		$spawn_interval = SPAWN_INTERVAL;
 	}
 
+	// let's enforce a minimum spawn interval as to not forkbomb the host
+	$spawn_interval = max(60, $spawn_interval);
+	_debug("Spawn interval: $spawn_interval sec");
+
 	if (isset($options["log"])) {
 		_debug("Logging to " . $options["log"]);
 		define('LOGFILE', $options["log"]);