misc daemon updates

diff --git a/functions.php b/functions.php
index b768d217ddabf8ba0c7bd75361a9c14b4d7d45de..572ecf1058cb974b0466cd5016b627c08bd6054c 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5798,12 +5798,6 @@
                // Send feed digests by email if needed.
                if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
 
-               purge_orphans($link);
-
-               $rc = cleanup_tags($link, 14, 50000);
-
-               if ($debug) _debug("$rc uncached tags cleaned.");
-
        } // function update_daemon_common
 
        function sanitize_article_content($text) {

diff --git a/update.php b/update.php
index ac1d84c8eb761a6105ab684ca181ae1a0ef1bdd5..873928b66171a9d1676132308f40851749d55cdb 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -85,7 +85,13 @@
                        update_daemon_common($link);
                } else {
                        $count = update_feedbrowser_cache($link);
-                       _debug("Finished, $count feeds processed.");
+                       _debug("Feedbrowser updated, $count feeds processed.");
+
+                       purge_orphans($link, true);
+       
+                       $rc = cleanup_tags($link, 14, 50000);
+
+                       _debug("Cleaned $rc cached tags.");
                }
 
        }

diff --git a/update_daemon2.php b/update_daemon2.php
index 5ffc4f549934528fcb1c9ae13ddf312325a981a5..63f218cc4961692765ea068c209a6ecb395650db 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -214,7 +214,14 @@
                                                update_daemon_common($link);
                                        } else {
                                                $count = update_feedbrowser_cache($link);
-                                               _debug("Finished, $count feeds processed.");
+                                               _debug("Feedbrowser updated, $count feeds processed.");
+
+                                               purge_orphans($link, true);
+
+                                               $rc = cleanup_tags($link, 14, 50000);
+
+                                               _debug("Cleaned $rc cached tags.");
+
                                        }
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");