X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=8f268cd35ac20cbebe0d9ed45980ce3f0670d630;hb=8572e0108aa76838da20d7d4ea21d6cd4b931f56;hp=8fc28973f6dd3ce2dd60a741e47aa4b68f554480;hpb=df659891ac0597c3f58b7714ddd4103ccad66b07;p=tt-rss.git diff --git a/update.php b/update.php index 8fc28973..8f268cd3 100755 --- a/update.php +++ b/update.php @@ -9,7 +9,6 @@ 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"; @@ -18,6 +17,8 @@ if (!defined('PHP_EXECUTABLE')) define('PHP_EXECUTABLE', '/usr/bin/php'); + $pdo = Db::pdo(); + init_plugins(); $longopts = array("feeds", @@ -35,6 +36,9 @@ "force-update", "gen-search-idx", "list-plugins", + "debug-feed:", + "force-refetch", + "force-rehash", "help"); foreach (PluginHost::getInstance()->get_commands() as $command => $data) { @@ -55,14 +59,13 @@ Tiny Tiny RSS data update script. -

- + query( "UPDATE ttrss_feeds SET + last_update_started = '1970-01-01', last_updated = '1970-01-01'"); } if (isset($options["feeds"])) { - update_daemon_common(); - housekeeping_common(true); + RSSUtils::update_daemon_common(); + RSSUtils::housekeeping_common(true); 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"; } @@ -174,8 +180,12 @@ $log = isset($options['log']) ? '--log '.$options['log'] : ''; passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log"); - _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds..."); - sleep(DAEMON_SLEEP_INTERVAL); + + // let's enforce a minimum spawn interval as to not forkbomb the host + $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL); + + _debug("Sleeping for $spawn_interval seconds..."); + sleep($spawn_interval); } } @@ -184,10 +194,10 @@ _debug("warning: unable to create stampfile\n"); } - update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT); + RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT); if (!isset($options["pidlock"]) || $options["task"] == 0) - housekeeping_common(true); + RSSUtils::housekeeping_common(true); PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op); } @@ -207,16 +217,16 @@ _debug("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); @@ -225,7 +235,7 @@ $line['table_name']." DROP INDEX ".$line['index_name']; _debug($statement); } - db_query( $statement, false); + $pdo->query($statement); } _debug("reading indexes from schema for: " . DB_TYPE); @@ -242,7 +252,7 @@ $statement = "CREATE INDEX $index ON $table"; _debug($statement); - db_query( $statement); + $pdo->query($statement); } } fclose($fp); @@ -261,11 +271,11 @@ _debug("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 @@ -306,7 +316,7 @@ if (isset($options["update-schema"])) { _debug("checking for updates (" . DB_TYPE . ")..."); - $updater = new DbUpdater(Db::get(), 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); @@ -319,7 +329,7 @@ for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) { _debug("performing update up to version $i..."); - $result = $updater->performUpdateTo($i); + $result = $updater->performUpdateTo($i, false); _debug($result ? "OK!" : "FAILED!"); @@ -335,40 +345,44 @@ if (isset($options["gen-search-idx"])) { echo "Generating search index (stemming set to English)...\n"; - $result = db_query("SELECT COUNT(id) AS count FROM ttrss_entries"); - $count = db_fetch_result($result, 0, "count"); + $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; - print "Total entries: $count.\n"; + $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE + tsvector_combined IS NULL ORDER BY id LIMIT ?"); + $sth->execute([$limit]); - $offset = 0; - $limit = 1000; + $usth = $pdo->prepare("UPDATE ttrss_entries + SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?"); while (true) { - $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit OFFSET $offset"); - if (db_num_rows($result) != 0) { - echo "Offset $offset...\n"; + while ($line = $sth->fetch()) { + $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000); - while ($line = db_fetch_assoc($result)) { - $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags($line['content']), - 0, 1000000)); + $usth->execute([$tsvector_combined, $line['id']]); - db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]); - } + $processed++; + } - $offset += $limit; - } else { + 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"; @@ -388,8 +402,23 @@ } + 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; + + $_REQUEST['xdebug'] = 1; + + $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"); ?>