Explicitly watch a "tube" - a named queue - to avoid stomping on

  anything else running under beanstalkd.

2 files changed, 6 insertions, 3 deletions

diff --git a/bin/custodian-enqueue b/bin/custodian-enqueue
index 34e225a..9e8e9a3 100755
--- a/bin/custodian-enqueue
+++ b/bin/custodian-enqueue
@@ -139,7 +139,7 @@ if __FILE__ == $0 then
   #
   # Connected to the server
   #
-  queue = Beanstalk::Pool.new([$SERVER])
+  queue = Beanstalk::Pool.new([$SERVER], "Custodian")
   if ( ! queue )
     puts "Failed to connect to beanstalk server: #{$SERVER}"
     exit 1
diff --git a/bin/custodian-queue b/bin/custodian-queue
index cb4c3ce..6298f88 100755
--- a/bin/custodian-queue
+++ b/bin/custodian-queue
@@ -129,9 +129,9 @@ if __FILE__ == $0 then
   end
 
   #
-  #  Create the object
+  #  Create the queue object.
   #
-  queue = Beanstalk::Pool.new([$SERVER])
+  queue = Beanstalk::Pool.new([$SERVER], "Custodian" )
 
   #
   # Alerting on a queue that is too-full?
@@ -169,11 +169,14 @@ if __FILE__ == $0 then
   #  Are we flushing the queue?
   #
   if ( $FLUSH )
+    count = 0
     while( true )
       begin
         job = queue.reserve(1)
         job.delete
+        count += 1
       rescue Beanstalk::TimedOut => ex
+        puts "Flushed #{count} pending jobs."
         exit( 0 )
       end
     end