diff --git a/common.php b/common.php index 997fe8c..e0a932f 100644 --- a/common.php +++ b/common.php @@ -31,6 +31,8 @@ defined('AUTO_UPDATE_DOWNLOAD_DIRECTORY') or define('AUTO_UPDATE_DOWNLOAD_DIRECT defined('AUTO_UPDATE_ARCHIVE_DIRECTORY') or define('AUTO_UPDATE_ARCHIVE_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'archive'); defined('AUTO_UPDATE_BACKUP_DIRECTORY') or define('AUTO_UPDATE_BACKUP_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'backup'); +defined('SUBSCRIPTION_CONCURRENT_REQUESTS') or define('SUBSCRIPTION_CONCURRENT_REQUESTS', 5); + defined('RULES_DIRECTORY') or define('RULES_DIRECTORY', ROOT_DIRECTORY.DIRECTORY_SEPARATOR.'rules'); defined('ENABLE_HSTS') or define('ENABLE_HSTS', true); diff --git a/config.default.php b/config.default.php index 9f452bd..3f39292 100644 --- a/config.default.php +++ b/config.default.php @@ -35,3 +35,6 @@ define('PROXY_PASSWORD', ''); // ENABLE_AUTO_UPDATE => default is true (enable Miniflux update from the user interface) define('ENABLE_AUTO_UPDATE', true); + +// SUBSCRIPTION_CONCURRENT_REQUESTS => number of concurrent feeds to refresh at once - reduce this number on systems with limited processing power +define('SUBSCRIPTION_CONCURRENT_REQUESTS', 5); diff --git a/controllers/feed.php b/controllers/feed.php index bef4a24..c39e8cc 100644 --- a/controllers/feed.php +++ b/controllers/feed.php @@ -122,8 +122,7 @@ Router\get_action('feeds', function() { 'nb_unread_items' => $nb_unread_items, 'nb_failed_feeds' => Model\Feed\count_failed_feeds(), 'menu' => 'feeds', - 'title' => t('Subscriptions'), - 'frontend_concurrent_requests' => Model\Config\get('frontend_concurrent_requests') + 'title' => t('Subscriptions') ))); }); diff --git a/models/config.php b/models/config.php index c4f863c..3754296 100644 --- a/models/config.php +++ b/models/config.php @@ -303,7 +303,6 @@ function validate_modification(array $values) new Validators\Integer('nocontent', t('Must be an integer')), new Validators\Integer('favicons', t('Must be an integer')), new Validators\Integer('original_marks_read', t('Must be an integer')), - new Validators\Integer('frontend_concurrent_requests', t('Must be an integer')), ); if (ENABLE_AUTO_UPDATE) { diff --git a/models/schema.php b/models/schema.php index 1999fdc..7375c06 100644 --- a/models/schema.php +++ b/models/schema.php @@ -5,12 +5,7 @@ namespace Schema; use PDO; use Model\Config; -const VERSION = 41; - -function version_41($pdo) -{ - $pdo->exec('INSERT INTO settings ("key", "value") VALUES ("frontend_concurrent_requests", 5)'); -} +const VERSION = 40; function version_40($pdo) { diff --git a/templates/config.php b/templates/config.php index 75a3653..e0d2a37 100644 --- a/templates/config.php +++ b/templates/config.php @@ -75,9 +75,7 @@


- - -
+>
diff --git a/templates/feeds.php b/templates/feeds.php index bb0c934..ac3a3b6 100644 --- a/templates/feeds.php +++ b/templates/feeds.php @@ -6,7 +6,7 @@
  • -
  • +