From f2ed1381c5dbbeba0b45504a0f0d5747a0cc84eb Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Fri, 30 Oct 2009 23:56:53 +0000
Subject: [PATCH] Debugging queue compatibility.
---
feeds.module | 4 +++-
includes/FeedsScheduler.inc | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/feeds.module b/feeds.module
index 99828234..f7bdaf96 100644
--- a/feeds.module
+++ b/feeds.module
@@ -18,6 +18,8 @@ define('FEEDS_EXPIRE_NEVER', -1);
// An object is not persistent at all. Compare to EXPORT_IN_DATABASE OR
// EXPORT_IN_CODE.
define('FEEDS_EXPORT_NONE', 0x0);
+// The Drupal Queue FeedsScheduler may use for scheduling importing or expiry.
+define('FEEDS_SCHEDULER_QUEUE', 'feeds_queue');
/**
@@ -38,7 +40,7 @@ function feeds_cron() {
*/
function feeds_cron_queue_info() {
$queues = array();
- $queues['feeds_queue'] = array(
+ $queues[FEEDS_SCHEDULER_QUEUE] = array(
'worker callback' => 'feeds_scheduler_work',
'time' => variable_get('feeds_worker_time', 60),
);
diff --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc
index 7b937645..bc3ffa8e 100644
--- a/includes/FeedsScheduler.inc
+++ b/includes/FeedsScheduler.inc
@@ -111,7 +111,11 @@ class FeedsScheduler implements IFeedsScheduler {
// Get feeds configuration, check whether drupal_queue is present and set
// parameters accordingly.
if ($importers = feeds_importer_load_all()) {
- $use_queue = module_exists('drupal_queue');
+
+ if ($use_queue = module_exists('drupal_queue')) {
+ drupal_queue_include();
+ $queue = drupal_queue_get(FEEDS_SCHEDULER_QUEUE);
+ }
$num = variable_get('feeds_schedule_num', $use_queue ? 200 : 5);
$num = $num ? $num : 1;
--
GitLab