X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=783217cef2e96a174d51ef727da3c12fef9338fd;hb=e552bb0bf65cf02cfead323fd675d3d036f885dd;hp=9d948a64d3c5cdea2e19cea5e1fcfa8d9f04c5ae;hpb=642432fc39956e92b599f204d64e0b365f36edf2;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 9d948a64..783217ce 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,9 +9,9 @@
 	define('DISABLE_SESSIONS', true);
 
 	require_once "version.php";
-	require_once "config.php";
 	require_once "autoload.php";
 	require_once "functions.php";
+	require_once "config.php";
 	require_once "rssfuncs.php";
 
 	// defaults
@@ -24,11 +24,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 +45,9 @@
 
 	$last_checkpoint = -1;
 
+	/**
+	 * @SuppressWarnings(unused)
+	 */
 	function reap_children() {
 		global $children;
 		global $ctimes;
@@ -76,6 +88,9 @@
 		}
 	}
 
+	/**
+	* @SuppressWarnings(unused)
+ 	*/
 	function sigchld_handler($signal) {
 		$running_jobs = reap_children();
 
@@ -218,10 +233,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);