rservicebus 0.1.45 → 0.1.46

data/bin/ReturnMessagesToSourceQueue

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+require "beanstalk-client"
+require "rservicebus"
+
+def returnMsg( beanstalk, job, request_nbr )
+    firstMatch = "ruby/object:"
+
+            payload = job.body
+
+            firstIndex = payload.index( firstMatch )
+            startIndex = payload.index( firstMatch, firstIndex + 1 ) + firstMatch.length
+
+            msgName = payload.match( '(\w*)', startIndex )[1]
+
+            msg = YAML::load(payload)
+            if msg.getLastErrorMsg.nil? then
+                puts "*** Requested msg, #{request_nbr}, does not have a sourceQueue to which it can be returned"
+                puts "*** Only errored msgs can be Returned"
+                puts "*** Generally, msgs would not be manually moved between queues"
+                puts "*** If you do need to, try"
+                puts "*** beanstalk-admin-dump <source queue name> | beanstalk-admin-load <destination queue name>"
+
+                job.release
+                return
+            end
+            queueName = msg.getLastErrorMsg.sourceQueue
+            puts "#" + "#{request_nbr.to_s}: #{msgName} to #{queueName}"
+
+            beanstalk.use( queueName )
+            beanstalk.put( payload )
+            
+            job.delete
+end
+
+
+index=nil
+if ARGV.length == 0 then
+        queueName = "error"
+elsif ARGV.length == 1 then
+        queueName = ARGV[0]
+elsif ARGV.length == 2 then
+        queueName = ARGV[0]
+        index = ARGV[1].to_i
+else
+        abort( "Usage: ReturnMessagesToSourceQueue [queue name] [index]" )
+end
+
+begin
+    host = 'localhost:11300'
+    beanstalk = Beanstalk::Pool.new([host])
+    
+    tubes = beanstalk.list_tubes[host]
+    if !tubes.include?(queueName) then
+        abort( "Nothing waiting on the Beanstalk queue, #{queueName}" )
+    end
+    
+    tubeStats = beanstalk.stats_tube(queueName)
+    number_of_messages = tubeStats["current-jobs-ready"]
+    if index.nil? then
+        puts
+        puts "Attempting to return #{number_of_messages} to their source queue"
+        puts
+    
+        begin
+            beanstalk.watch(queueName)
+            1.upto(number_of_messages) do |request_nbr|
+                job = beanstalk.reserve 1
+            
+                returnMsg( beanstalk, job, request_nbr )
+            end
+            rescue Exception => e
+            if e.message == "TIMED_OUT" then
+                else
+                raise
+            end
+        end
+    else
+        if index > number_of_messages then
+            puts "*** Requested msg, #{index}, is greater than the number of msgs in the queue, #{number_of_messages}"
+            puts "*** Try a smaller index, or remove the index number to return all msgs"
+            abort();
+        end
+
+        puts
+        puts "Attempting to msg number, #{index} to it's source queue"
+        puts
+    
+        begin
+            beanstalk.watch(queueName)
+            jobList = Array.new
+            1.upto(index-1) do |request_nbr|
+                job = beanstalk.reserve 1
+                jobList << job
+            end
+            job = beanstalk.reserve 1
+            returnMsg( beanstalk, job, index )
+
+            jobList.each do |job|
+                job.release
+            end
+
+            rescue Exception => e
+            if e.message == "TIMED_OUT" then
+                else
+                raise
+            end
+        end
+    end
+    
+    rescue Beanstalk::NotConnected=>e
+    puts "Beanstalk not running"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70286679995660 !ruby/object:Gem::Requirement
+  requirement: &70280120092440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286679995660
+  version_requirements: *70280120092440
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70286679994800 !ruby/object:Gem::Requirement
+  requirement: &70280120091760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286679994800
+  version_requirements: *70280120091760
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70286680016340 !ruby/object:Gem::Requirement
+  requirement: &70280120090960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286680016340
+  version_requirements: *70280120090960
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70286680015220 !ruby/object:Gem::Requirement
+  requirement: &70280120089780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286680015220
+  version_requirements: *70280120089780
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70286680014580 !ruby/object:Gem::Requirement
+  requirement: &70280120088700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286680014580
+  version_requirements: *70280120088700
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -138,6 +138,7 @@ files:
 - lib/rservicebus/UserMessage/WithPayload.rb
 - lib/rservicebus.rb
 - bin/ReturnErroredMessagesToSourceQueue
+- bin/ReturnMessagesToSourceQueue
 - bin/rservicebus
 - bin/rservicebus-init
 - bin/rservicebus-transport