X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=d4160c7ba1cc557367184ee0a959b52a6477e62d;hb=e2cf81e21406f0b507446cf369f7da172ce9da14;hp=c301083f931e3c22f0f64ab5d13adee0ebfd79dd;hpb=1f294435307ef6cbbf3f35a22af9bf92131338ed;p=tt-rss.git

diff --git a/update.php b/update.php
index c301083f..d4160c7b 100755
--- 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"])) {