unify houskeeping stuff, increase spawn interval

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f4fa18dc91c758122768a9dc2045c2024fb7794d..a64d60e1eebbbc84ba29e89dcda4b7713cb035c1 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1,7 +1,7 @@
 <?php
        define_default('DAEMON_UPDATE_LOGIN_LIMIT', 30);
        define_default('DAEMON_FEED_LIMIT', 500);
-       define_default('DAEMON_SLEEP_INTERVAL', 60);
+       define_default('DAEMON_SLEEP_INTERVAL', 120);
 
        function update_feedbrowser_cache() {
 
@@ -150,10 +150,6 @@
                                WHERE feed_url IN (%s)", implode(',', $feeds_quoted)));
                }
 
-               expire_cached_files($debug);
-               expire_lock_files($debug);
-               expire_error_log($debug);
-
                $nf = 0;
 
                // For each feed, we call the feed update function.
@@ -1169,7 +1165,7 @@
        }
 
        function expire_lock_files($debug) {
-               if ($debug) _debug("Removing old lock files...");
+               //if ($debug) _debug("Removing old lock files...");
 
                $num_deleted = 0;
 
@@ -1186,14 +1182,14 @@
                        }
                }
 
-               if ($debug) _debug("Removed $num_deleted files.");
+               if ($debug) _debug("Removed $num_deleted old lock files.");
        }
 
        function expire_cached_files($debug) {
                foreach (array("simplepie", "images", "export", "upload") as $dir) {
                        $cache_dir = CACHE_DIR . "/$dir";
 
-                       if ($debug) _debug("Expiring $cache_dir");
+//                     if ($debug) _debug("Expiring $cache_dir");
 
                        $num_deleted = 0;
 
@@ -1211,7 +1207,7 @@
                                }
                        }
 
-                       if ($debug) _debug("Removed $num_deleted files.");
+                       if ($debug) _debug("$cache_dir: removed $num_deleted files.");
                }
        }
 
@@ -1374,4 +1370,17 @@
                return $error;
        }
 
+       function housekeeping_common($debug) {
+               expire_cached_files($debug);
+               expire_lock_files($debug);
+               expire_error_log($debug);
+
+               $count = update_feedbrowser_cache();
+               _debug("Feedbrowser updated, $count feeds processed.");
+
+               purge_orphans( true);
+               $rc = cleanup_tags( 14, 50000);
+
+               _debug("Cleaned $rc cached tags.");
+       }
 ?>