summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2015-12-18 11:56:32 +0200
committerSteve Kemp <steve@steve.org.uk>2015-12-18 11:56:32 +0200
commitca00933b7094642f218d428bf663f99f9c5e524d (patch)
tree4ea24656009aa5897293bde481ca391e42290515 /bin
parent048e2bfb8e8bdb152d5373b47dd54553e40e5b78 (diff)
Removed references and support for beanstalkd.
The beanstalkd queue used to be used in the past, and we later added support for Redis via a simple abstraction layer. But now we've no longer tested and used beanstalkd for over a year, and the client-libraries are no longer available as native Debian packages. With that in mind we've excised the code, although left the abstraction-class in-place.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/custodian-enqueue5
-rwxr-xr-xbin/custodian-queue6
2 files changed, 3 insertions, 8 deletions
diff --git a/bin/custodian-enqueue b/bin/custodian-enqueue
index 1588638..7dd864b 100755
--- a/bin/custodian-enqueue
+++ b/bin/custodian-enqueue
@@ -60,10 +60,9 @@ if __FILE__ == $PROGRAM_NAME
end
#
- # Connected to the queue - be it redis or beanstalkd
+ # Connected to the queue.
#
- settings = Custodian::Settings.instance
- queue = Custodian::QueueType.create(settings.queue_type)
+ queue = Custodian::RedisQueueType.new()
unless queue
puts "Failed to connect to the #{settings.queue_type} queue"
exit 1
diff --git a/bin/custodian-queue b/bin/custodian-queue
index fcbf2b3..a78ae25 100755
--- a/bin/custodian-queue
+++ b/bin/custodian-queue
@@ -62,8 +62,7 @@ if __FILE__ == $PROGRAM_NAME
#
# Create the queue object.
#
- settings = Custodian::Settings.instance
- queue = Custodian::QueueType.create(settings.queue_type)
+ queue = Custodian::RedisQueueType.new()
#
# Alerting on a queue that is too-full?
@@ -129,9 +128,6 @@ __END__
# This tool is designed to inspect the global queue, and also allows that
# queue to be flushed of all pending-jobs.
#
-# The queue may be redis-based, or beanstalkd-based, as defined by the
-# global configuration-file.
-#
# AUTHOR
#
# Steve Kemp <steve@bytemark.co.uk>