diff --git a/CHANGELOG.txt b/CHANGELOG.txt index aed359d792e5ee463abf4a255ec1e84884d3d14f..28d8d76d6db2bdaa8de25ee596fe2f9e549634af 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,8 @@ Feeds 6.x 1.0 xxx, 2009-xx-xx ----------------------------- +- Split number of items to queue on cron from feeds_schedule_num variable + (see README.txt) - #619110 Fix node_delete() in FeedsNodeProcessor - Add descriptions to all mapping sources and targets diff --git a/README.txt b/README.txt index dc6a7596d6132456a3371d132953ef99fd60e2a7..62081796463a5207b1503b9579eadb8093971250 100644 --- a/README.txt +++ b/README.txt @@ -91,10 +91,15 @@ Description: Execution time for a queue worker, only effective if used with Name: feeds_schedule_num Default: 5 - 200 if drupal_queue is enabled -Description: The number of feeds to refresh on cron time. - If drupal_queue is enabled, the maximum number of feeds to move to - queue. +Description: The number of feeds to import on cron time. + Only has an effect if Drupal Queue is *not* enabled. + http://drupal.org/project/drupal_queue + +Name: feeds_schedule_queue_num +Default: 200 + The number of feeds to queue on cron time. Only has an effect if + Drupal Queue is enabled. + http://drupal.org/project/drupal_queue Glossary ======== diff --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc index cf1a7899c7c82617552eab54fd33f5880b520ebb..f3817beeb277962aa3ec8de4e5e2f05704380dee 100644 --- a/includes/FeedsScheduler.inc +++ b/includes/FeedsScheduler.inc @@ -110,9 +110,11 @@ class FeedsScheduler implements IFeedsScheduler { if ($use_queue = module_exists('drupal_queue')) { drupal_queue_include(); $queue = drupal_queue_get(FEEDS_SCHEDULER_QUEUE); + $num = variable_get('feeds_schedule_queue_num', 200); + } + else { + $num = variable_get('feeds_schedule_num', 5); } - $num = variable_get('feeds_schedule_num', $use_queue ? 200 : 5); - $num = $num ? $num : 1; // Iterate over feed configurations, pick $num feeds for each // configuration, push to queue or refresh feeds.