X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=521b956ad33b7d60311928690ff0da1716864042;hb=7e14bd35bb2264d83aaa6d13fa16188763aa4f8c;hp=f542a390bf833fbfcaed6f4d6a002acbb7ae44ba;hpb=6f7798b6434f5ef6073447998c436901b507e3df;p=tt-rss.git
diff --git a/update.php b/update.php
index f542a390..521b956a 100755
--- a/update.php
+++ b/update.php
@@ -42,12 +42,19 @@
$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')) {
?>
Tiny Tiny RSS data update script.
-
+
@@ -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);
}
@@ -175,7 +183,9 @@
}
update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- housekeeping_common(true);
+
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ housekeeping_common(true);
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
@@ -344,10 +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");
?>