X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=521b956ad33b7d60311928690ff0da1716864042;hb=d35bd9a2336d058f0bb9d60a02b54bea0531ba39;hp=ce354bbae62c7680c54d1638b11f08e22784185b;hpb=fce451a4f796e8ccafc9aec692cb8821c085fc97;p=tt-rss.git
diff --git a/update.php b/update.php
index ce354bba..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.
-
+
@@ -148,18 +155,8 @@
}
if (isset($options["feeds"])) {
- // Update all feeds needing a update.
update_daemon_common();
-
- // Update feedbrowser
- $count = update_feedbrowser_cache();
- _debug("Feedbrowser updated, $count feeds processed.");
-
- // Purge orphans and cleanup tags
- purge_orphans( true);
-
- $rc = cleanup_tags( 14, 50000);
- _debug("Cleaned $rc cached tags.");
+ housekeeping_common(true);
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
@@ -172,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);
}
@@ -184,16 +182,11 @@
_debug("warning: unable to create stampfile\n");
}
- update_daemon_common();
-
- $count = update_feedbrowser_cache();
- _debug("Feedbrowser updated, $count feeds processed.");
+ update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- purge_orphans( true);
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ housekeeping_common(true);
- $rc = cleanup_tags( 14, 50000);
-
- _debug("Cleaned $rc cached tags.");
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
@@ -338,7 +331,7 @@
}
if (isset($options["list-plugins"])) {
- $tmppluginhost = new PluginHost(Db::get());
+ $tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
$enabled = array_map("trim", explode(",", PLUGINS));
@@ -361,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");
?>