fix missing DB object when instantiated to import opml

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index abbe6c577bc5d496859674fc2806989de9205160..c301083f931e3c22f0f64ab5d13adee0ebfd79dd 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -14,7 +14,6 @@
        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');
@@ -30,13 +29,14 @@
                        "quiet",
                        "log:",
                        "indexes",
+                       "pidlock:",
                        "update-schema",
                        "convert-filters",
                        "force-update",
                        "list-plugins",
                        "help");
 
-       foreach ($pluginhost->get_commands() as $command => $data) {
+       foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
                array_push($longopts, $command . $data["suffix"]);
        }
 
@@ -79,7 +79,7 @@
                print "  --help               - show this help\n";
                print "Plugin options:\n";
 
-               foreach ($pluginhost->get_commands() as $command => $data) {
+               foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
                        $args = $data['arghelp'];
                        printf(" --%-19s - %s\n", "$command $args", $data["description"]);
                }
@@ -87,6 +87,10 @@
                return;
        }
 
+       if (!isset($options['daemon'])) {
+               require_once "errorhandler.php";
+       }
+
        if (!isset($options['update-schema'])) {
                $schema_version = get_schema_version();
 
@@ -113,9 +117,23 @@
                $lock_filename = $lock_filename . "-task_" . $options["task"];
        }
 
+       if (isset($options["pidlock"])) {
+               $my_pid = $options["pidlock"];
+               $lock_filename = "update_daemon-$my_pid.lock";
+
+       }
+
+       _debug("Lock: $lock_filename");
+
        $lock_handle = make_lockfile($lock_filename);
        $must_exit = false;
 
+       if (isset($options["task"]) && isset($options["pidlock"])) {
+               $waits = $options["task"] * 5;
+               _debug("Waiting before update ($waits)");
+               sleep($waits);
+       }
+
        // Try to lock a file in order to avoid concurrent update.
        if (!$lock_handle) {
                die("error: Can't create lockfile ($lock_filename). ".
@@ -143,8 +161,7 @@
                $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"])) {
@@ -182,8 +199,7 @@
 
                        _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);
                }
 
        }
@@ -292,7 +308,7 @@
                                $_REQUEST = $filter;
                                $_SESSION["uid"] = $owner_uid;
 
-                               $filters = new Pref_Filters( $_REQUEST);
+                               $filters = new Pref_Filters($_REQUEST);
                                $filters->add();
                        }
                }
@@ -302,7 +318,7 @@
        if (isset($options["update-schema"])) {
                _debug("checking for updates (" . DB_TYPE . ")...");
 
-               $updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
+               $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
 
                if ($updater->isUpdateRequired()) {
                        _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
@@ -329,7 +345,7 @@
        }
 
        if (isset($options["list-plugins"])) {
-               $tmppluginhost = new PluginHost();
+               $tmppluginhost = new PluginHost(Db::get());
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
                $enabled = array_map("trim", explode(",", PLUGINS));
 
@@ -350,7 +366,7 @@
 
        }
 
-       $pluginhost->run_commands($options);
+       PluginHost::getInstance()->run_commands($options);
 
        if ($lock_handle != false) {
                fclose($lock_handle);