X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=521b956ad33b7d60311928690ff0da1716864042;hb=9fd581336e3044425c3d2d915ee81c8c5741d226;hp=08a872dc0bded0e85617661cb592c616a495d9be;hpb=9ffe8907dd8be17501601c5af53c73fd0f25ee04;p=tt-rss.git diff --git a/update.php b/update.php index 08a872dc..521b956a 100755 --- a/update.php +++ b/update.php @@ -42,6 +42,13 @@ $options = getopt("", $longopts); + 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"); + } + if (count($options) == 0 && !defined('STDIN')) { ?> @@ -162,8 +169,9 @@ if (isset($options["daemon"])) { while (true) { $quiet = (isset($options["quiet"])) ? "--quiet" : ""; + $log = isset($options['log']) ? '--log '.$options['log'] : ''; - passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet"); + passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log"); _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds..."); sleep(DAEMON_SLEEP_INTERVAL); } @@ -346,8 +354,6 @@ PluginHost::getInstance()->run_commands($options); - if ($lock_handle != false) { - fclose($lock_handle); - } - + if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) + unlink(LOCK_DIRECTORY . "/$lock_filename"); ?>