From 7d90bf7fba34d586c25ed096b8a2fc0fdf311879 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Mon, 19 Jan 2015 12:27:15 +0000
Subject: Updated to use our queue-abstraction.

This means we can queue/dequeue to either Redis or Beanstalkd.
---
 bin/custodian-dequeue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'bin/custodian-dequeue')

diff --git a/bin/custodian-dequeue b/bin/custodian-dequeue
index 3072fbd..7a99186 100755
--- a/bin/custodian-dequeue
+++ b/bin/custodian-dequeue
@@ -53,6 +53,7 @@ require 'getoptlong'
 # Our code.
 #
 require 'custodian/settings'
+require 'custodian/queue'
 require 'custodian/worker'
 
 
@@ -71,7 +72,6 @@ if __FILE__ == $0 then
   #
   settings = Custodian::Settings.instance()
   $SERVER  = settings.queue_server
-  $QUEUE   = settings.queue_name
   $ALERTER = settings.alerter
   $LOGFILE = settings.log_file
 
@@ -82,7 +82,6 @@ if __FILE__ == $0 then
                           [ "--manual",  "-m", GetoptLong::NO_ARGUMENT ],
                           [ "--fail",    "-f", GetoptLong::NO_ARGUMENT  ],
                           [ "--logfile", "-l", GetoptLong::REQUIRED_ARGUMENT ],
-                          [ "--queue",   "-q", GetoptLong::REQUIRED_ARGUMENT ],
                           [ "--server",  "-S", GetoptLong::REQUIRED_ARGUMENT ],
                           [ "--alerter", "-a", GetoptLong::REQUIRED_ARGUMENT ],
                           [ "--single",  "-s", GetoptLong::NO_ARGUMENT ],
@@ -96,8 +95,6 @@ if __FILE__ == $0 then
           $LOGFILE = arg
       when "--server" then
           $SERVER = arg
-      when "--queue" then
-          $QUEUE = arg
       when "--alerter" then
           $ALERTER = arg
       when "--single" then
@@ -149,7 +146,7 @@ if __FILE__ == $0 then
   #
   #  Create the object
   #
-  worker = Custodian::Worker.new( $SERVER, $QUEUE, $ALERTER, $LOGFILE, settings )
+  worker = Custodian::Worker.new( $SERVER, $ALERTER, $LOGFILE, settings )
 
 
   #
-- 
cgit v1.2.1