X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=1dddf6efdaec9d63edec1ef77eb2de4a9531753f;hb=da7e3e91bf6051d342819d596b76dd4e05740cd6;hp=d5b6a45e36b0cf35fa088f875840382077d2544e;hpb=52af297e745f5b5c101c642c45e08d268aa324d8;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index d5b6a45e..1dddf6ef 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();
@@ -203,6 +212,7 @@
 					if (!$master_handlers_installed) {
 						_debug("[MASTER] installing shutdown handlers");
 						pcntl_signal(SIGINT, 'sigint_handler');
+						pcntl_signal(SIGTERM, 'sigint_handler');
 						register_shutdown_function('shutdown', posix_getpid());
 						$master_handlers_installed = true;
 					}
@@ -217,10 +227,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);