new config option: DAEMON_FEED_LIMIT

diff --git a/config.php-dist b/config.php-dist
index 55c0684416b31a2ca6d5e07d34a65d54dd068bdc..8001513d0c5c671a9cd1971295ecccda8b2fa6fd 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -161,7 +161,10 @@
        // These two options enable SMTP authentication when sending
        // digests. Require DIGEST_SMTP_HOST.
 
-       define('CONFIG_VERSION', 11);
+       define('DAEMON_FEED_LIMIT', 100);
+       // Limits the amount of feeds daemon updates on one run
+
+       define('CONFIG_VERSION', 12);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
 

diff --git a/sanity_check.php b/sanity_check.php
index 4e99dc20aa87bf4d12db6f2d8250620781d984ac..a8a91b73c4e8dac1f9f3c7ca634573a8375e1bfd 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,7 +1,7 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 11);
+       define('EXPECTED_CONFIG_VERSION', 12);
        define('SCHEMA_VERSION', 26);
 
        if (!file_exists("config.php")) {

diff --git a/update_daemon.php b/update_daemon.php
index 50d13191cff6c1d33b7b74dd39bae3c69f5a6975..75229f667f3354de090671a85432fc0dca84f2fd 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -133,7 +133,7 @@
                                ttrss_feeds,ttrss_users 
                        WHERE 
                                ttrss_users.id = owner_uid $login_thresh_qpart 
-                       ORDER BY $random_qpart DESC");
+                       ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
 
                $user_prefs_cache = array();