unify houskeeping stuff, increase spawn interval

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index c301083f931e3c22f0f64ab5d13adee0ebfd79dd..d4160c7ba1cc557367184ee0a959b52a6477e62d 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -148,18 +148,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);
        }
@@ -184,24 +174,10 @@
                        _debug("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);
-
-                       _debug("Cleaned $rc cached tags.");
-
-                       PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-               }
+               update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+               housekeeping_common(true);
 
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
        }
 
        if (isset($options["cleanup-tags"])) {