X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=update.php;h=17eafe126675359e120034f52a7d7e0e19d75078;hp=fcce26d5c864ff950b8b1ad7e3091632b8d3d5c2;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hpb=7440a7fe3c43644cc3a90fe94e7c23795f04eeba
diff --git a/update.php b/update.php
index fcce26d5..17eafe12 100755
--- a/update.php
+++ b/update.php
@@ -9,16 +9,16 @@
require_once "autoload.php";
require_once "functions.php";
- require_once "rssfuncs.php";
require_once "config.php";
require_once "sanity_check.php";
require_once "db.php";
require_once "db-prefs.php";
- require_once "errorhandler.php";
if (!defined('PHP_EXECUTABLE'))
define('PHP_EXECUTABLE', '/usr/bin/php');
+ $pdo = Db::pdo();
+
init_plugins();
$longopts = array("feeds",
@@ -29,33 +29,44 @@
"cleanup-tags",
"quiet",
"log:",
+ "log-level:",
"indexes",
"pidlock:",
"update-schema",
"convert-filters",
"force-update",
+ "gen-search-idx",
"list-plugins",
+ "debug-feed:",
+ "force-refetch",
+ "force-rehash",
"help");
- foreach ($pluginhost->get_commands() as $command => $data) {
+ foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
array_push($longopts, $command . $data["suffix"]);
}
$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.
-
-
+
get_commands() as $command => $data) {
+ foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
$args = $data['arghelp'];
printf(" --%-19s - %s\n", "$command $args", $data["description"]);
}
@@ -88,6 +104,10 @@
return;
}
+ if (!isset($options['daemon'])) {
+ require_once "errorhandler.php";
+ }
+
if (!isset($options['update-schema'])) {
$schema_version = get_schema_version();
@@ -96,12 +116,17 @@
}
}
- define('QUIET', isset($options['quiet']));
+ Debug::set_enabled(true);
+ Debug::set_quiet(isset($options['quiet']));
+
+ if (isset($options["log-level"])) {
+ Debug::set_loglevel((int)$options["log-level"]);
+ }
if (isset($options["log"])) {
- _debug("Logging to " . $options["log"]);
- define('LOGFILE', $options["log"]);
- }
+ Debug::set_logfile($options["log"]);
+ Debug::log("Logging to " . $options["log"]);
+ }
if (!isset($options["daemon"])) {
$lock_filename = "update.lock";
@@ -110,7 +135,7 @@
}
if (isset($options["task"])) {
- _debug("Using task id " . $options["task"]);
+ Debug::log("Using task id " . $options["task"]);
$lock_filename = $lock_filename . "-task_" . $options["task"];
}
@@ -120,14 +145,14 @@
}
- _debug("Lock: $lock_filename");
+ Debug::log("Lock: $lock_filename");
$lock_handle = make_lockfile($lock_filename);
$must_exit = false;
- if (isset($options["task"])) {
+ if (isset($options["task"]) && isset($options["pidlock"])) {
$waits = $options["task"] * 5;
- _debug("Waiting before update ($waits)");
+ Debug::log("Waiting before update ($waits)");
sleep($waits);
}
@@ -138,108 +163,90 @@
}
if (isset($options["force-update"])) {
- _debug("marking all feeds as needing update...");
+ Debug::log("marking all feeds as needing update...");
- db_query( "UPDATE ttrss_feeds SET last_update_started = '1970-01-01',
- last_updated = '1970-01-01'");
+ $pdo->query( "UPDATE ttrss_feeds SET
+ last_update_started = '1970-01-01', last_updated = '1970-01-01'");
}
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.");
+ RSSUtils::update_daemon_common();
+ RSSUtils::housekeeping_common(true);
- // Purge orphans and cleanup tags
- purge_orphans( true);
-
- $rc = cleanup_tags( 14, 50000);
- _debug("Cleaned $rc cached tags.");
-
- global $pluginhost;
- $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
if (isset($options["feedbrowser"])) {
- $count = update_feedbrowser_cache();
+ $count = RSSUtils::update_feedbrowser_cache();
print "Finished, $count feeds processed.\n";
}
if (isset($options["daemon"])) {
while (true) {
$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+ $log = isset($options['log']) ? '--log '.$options['log'] : '';
+ $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
+
+ passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+
+ // let's enforce a minimum spawn interval as to not forkbomb the host
+ $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
- passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
- _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
- sleep(DAEMON_SLEEP_INTERVAL);
+ Debug::log("Sleeping for $spawn_interval seconds...");
+ sleep($spawn_interval);
}
}
if (isset($options["daemon-loop"])) {
if (!make_stampfile('update_daemon.stamp')) {
- _debug("warning: unable to create stampfile\n");
+ Debug::log("warning: unable to create stampfile\n");
}
- // Call to the feed batch update function
- // or regenerate feedbrowser cache
-
- if (rand(0,100) > 30) {
- update_daemon_common();
- } else {
- $count = update_feedbrowser_cache();
- _debug("Feedbrowser updated, $count feeds processed.");
-
- purge_orphans( true);
-
- $rc = cleanup_tags( 14, 50000);
+ RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- _debug("Cleaned $rc cached tags.");
-
- global $pluginhost;
- $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
- }
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ RSSUtils::housekeeping_common(true);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
if (isset($options["cleanup-tags"])) {
$rc = cleanup_tags( 14, 50000);
- _debug("$rc tags deleted.\n");
+ Debug::log("$rc tags deleted.\n");
}
if (isset($options["indexes"])) {
- _debug("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
- _debug("Type 'yes' to continue.");
+ Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
+ Debug::log("Type 'yes' to continue.");
if (read_stdin() != 'yes')
exit;
- _debug("clearing existing indexes...");
+ Debug::log("clearing existing indexes...");
if (DB_TYPE == "pgsql") {
- $result = db_query( "SELECT relname FROM
+ $sth = $pdo->query( "SELECT relname FROM
pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
AND relname NOT LIKE '%_pkey'
AND relkind = 'i'");
} else {
- $result = db_query( "SELECT index_name,table_name FROM
+ $sth = $pdo->query( "SELECT index_name,table_name FROM
information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
}
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $sth->fetch()) {
if (DB_TYPE == "pgsql") {
$statement = "DROP INDEX " . $line["relname"];
- _debug($statement);
+ Debug::log($statement);
} else {
$statement = "ALTER TABLE ".
$line['table_name']." DROP INDEX ".$line['index_name'];
- _debug($statement);
+ Debug::log($statement);
}
- db_query( $statement, false);
+ $pdo->query($statement);
}
- _debug("reading indexes from schema for: " . DB_TYPE);
+ Debug::log("reading indexes from schema for: " . DB_TYPE);
$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
if ($fp) {
@@ -252,31 +259,31 @@
$statement = "CREATE INDEX $index ON $table";
- _debug($statement);
- db_query( $statement);
+ Debug::log($statement);
+ $pdo->query($statement);
}
}
fclose($fp);
} else {
- _debug("unable to open schema file.");
+ Debug::log("unable to open schema file.");
}
- _debug("all done.");
+ Debug::log("all done.");
}
if (isset($options["convert-filters"])) {
- _debug("WARNING: this will remove all existing type2 filters.");
- _debug("Type 'yes' to continue.");
+ Debug::log("WARNING: this will remove all existing type2 filters.");
+ Debug::log("Type 'yes' to continue.");
if (read_stdin() != 'yes')
exit;
- _debug("converting filters...");
+ Debug::log("converting filters...");
- db_query( "DELETE FROM ttrss_filters2");
+ $pdo->query("DELETE FROM ttrss_filters2");
- $result = db_query( "SELECT * FROM ttrss_filters ORDER BY id");
+ $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $res->fetch()) {
$owner_uid = $line["owner_uid"];
// date filters are removed
@@ -307,7 +314,7 @@
$_REQUEST = $filter;
$_SESSION["uid"] = $owner_uid;
- $filters = new Pref_Filters( $_REQUEST);
+ $filters = new Pref_Filters($_REQUEST);
$filters->add();
}
}
@@ -315,37 +322,75 @@
}
if (isset($options["update-schema"])) {
- _debug("checking for updates (" . DB_TYPE . ")...");
+ Debug::log("checking for updates (" . DB_TYPE . ")...");
- $updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
+ $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
if ($updater->isUpdateRequired()) {
- _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
- _debug("WARNING: please backup your database before continuing.");
- _debug("Type 'yes' to continue.");
+ Debug::log("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+ Debug::log("WARNING: please backup your database before continuing.");
+ Debug::log("Type 'yes' to continue.");
if (read_stdin() != 'yes')
exit;
for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
- _debug("performing update up to version $i...");
+ Debug::log("performing update up to version $i...");
- $result = $updater->performUpdateTo($i);
+ $result = $updater->performUpdateTo($i, false);
- _debug($result ? "OK!" : "FAILED!");
+ Debug::log($result ? "OK!" : "FAILED!");
if (!$result) return;
}
} else {
- _debug("update not required.");
+ Debug::log("update not required.");
}
}
+ if (isset($options["gen-search-idx"])) {
+ echo "Generating search index (stemming set to English)...\n";
+
+ $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+ $row = $res->fetch();
+ $count = $row['count'];
+
+ print "Articles to process: $count.\n";
+
+ $limit = 500;
+ $processed = 0;
+
+ $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
+ tsvector_combined IS NULL ORDER BY id LIMIT ?");
+ $sth->execute([$limit]);
+
+ $usth = $pdo->prepare("UPDATE ttrss_entries
+ SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
+
+ while (true) {
+
+ while ($line = $sth->fetch()) {
+ $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+
+ $usth->execute([$tsvector_combined, $line['id']]);
+
+ $processed++;
+ }
+
+ print "Processed $processed articles...\n";
+
+ if ($processed < $limit) {
+ echo "All done.\n";
+ break;
+ }
+ }
+ }
+
if (isset($options["list-plugins"])) {
$tmppluginhost = new PluginHost();
- $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
+ $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
$enabled = array_map("trim", explode(",", PLUGINS));
echo "List of all available plugins:\n";
@@ -365,12 +410,23 @@
}
- $pluginhost->run_commands($options);
+ if (isset($options["debug-feed"])) {
+ $feed = $options["debug-feed"];
+
+ if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
+ if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+
+ Debug::set_loglevel(Debug::$LOG_EXTENDED);
- if ($lock_handle != false) {
- fclose($lock_handle);
+ $rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
+
+ exit($rc);
}
+ PluginHost::getInstance()->run_commands($options);
+
if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+ fclose($lock_handle);
unlink(LOCK_DIRECTORY . "/$lock_filename");
?>
