Revert "do not unlink lockfiles (closes #703)"

[tt-rss.git] / update.php
diff --git a/update.php b/update.php

index be7314175d628df1611c6bd11feba3645b981dc1..0141b1a8e5c31a072c3ebfe8219ab412f587d689 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -36,7 +36,7 @@
                         "list-plugins",
                         "help");
  
-       foreach ($pluginhost->get_commands() as $command => $data) {
+       foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
                 array_push($longopts, $command . $data["suffix"]);
         }
  
@@ -47,7 +47,7 @@
                 <head>
                 <title>Tiny Tiny RSS data update script.</title>
                 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-               <link rel="stylesheet" type="text/css" href="utility.css">
+               <link rel="stylesheet" type="text/css" href="css/utility.css">
                 </head>
  
                 <body>
@@ -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"]);
                 }
@@ -148,21 +148,10 @@
         }
  
         if (isset($options["feeds"])) {
-               // Update all feeds needing a update.
                 update_daemon_common();
+               housekeeping_common(true);
  
-               // 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.");
-
-               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"])) {
@@ -185,25 +174,12 @@
                         _debug("warning: unable to create stampfile\n");
                 }
  
-               // Call to the feed batch update function
-               // or regenerate feedbrowser cache
+               update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
  
-               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);
-
-                       _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)
+                       housekeeping_common(true);
  
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
         }
  
         if (isset($options["cleanup-tags"])) {
@@ -310,7 +286,7 @@
                                 $_REQUEST = $filter;
                                 $_SESSION["uid"] = $owner_uid;
  
-                               $filters = new Pref_Filters( $_REQUEST);
+                               $filters = new Pref_Filters($_REQUEST);
                                 $filters->add();
                         }
                 }
@@ -347,7 +323,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));
  
@@ -368,7 +344,7 @@
  
         }
  
-       $pluginhost->run_commands($options);
+       PluginHost::getInstance()->run_commands($options);
  
         if ($lock_handle != false) {
                 fclose($lock_handle);