rservicebus 0.0.25 → 0.0.26

data/bin/ReturnErroredMessagesToSourceQueue

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+puts `ReturnErroredMessagesToSourceQueueBeanstalk`
+puts `ReturnErroredMessagesToSourceQueueBunny`

data/bin/ReturnErroredMessagesToSourceQueueBeanstalk

@@ -6,39 +6,44 @@ require "beanstalk-client"
 
 require "rservicebus"
 
-host = 'localhost:11300'
-errorQueueName = "error"
-beanstalk = Beanstalk::Pool.new([host])
-
-tubes = beanstalk.list_tubes[host]
-if !tubes.include?(errorQueueName) then
-	abort( "Nothing waiting on the error queue" )
-end
-
-tubeStats = beanstalk.stats_tube(errorQueueName)
-number_of_messages = tubeStats["current-jobs-ready"]
-puts
-puts "Attempting to return #{number_of_messages} to their source queue"
-puts
-
 begin
-	beanstalk.watch(errorQueueName)
-	1.upto(number_of_messages) do |request_nbr|
-		job = beanstalk.reserve 1
-		payload = job.body
-
-		puts "#" + request_nbr.to_s + ": " + payload
-		msg = YAML::load(payload)
-		queueName = msg.getLastErrorMsg.sourceQueue
-
-		beanstalk.use( queueName )
-		beanstalk.put( payload )
-
-		job.delete
-	end
-rescue Exception => e
-	if e.message == "TIMED_OUT" then
-	else
-		raise
-	end
+    host = 'localhost:11300'
+    errorQueueName = "error"
+    beanstalk = Beanstalk::Pool.new([host])
+    
+    tubes = beanstalk.list_tubes[host]
+    if !tubes.include?(errorQueueName) then
+        abort( "Nothing waiting on the Beanstalk error queue" )
+    end
+    
+    tubeStats = beanstalk.stats_tube(errorQueueName)
+    number_of_messages = tubeStats["current-jobs-ready"]
+    puts
+    puts "Attempting to return #{number_of_messages} to their source queue"
+    puts
+    
+    begin
+        beanstalk.watch(errorQueueName)
+        1.upto(number_of_messages) do |request_nbr|
+            job = beanstalk.reserve 1
+            payload = job.body
+            
+            puts "#" + request_nbr.to_s + ": " + payload
+            msg = YAML::load(payload)
+            queueName = msg.getLastErrorMsg.sourceQueue
+            
+            beanstalk.use( queueName )
+            beanstalk.put( payload )
+            
+            job.delete
+        end
+        rescue Exception => e
+        if e.message == "TIMED_OUT" then
+            else
+            raise
+        end
+    end
+    
+    rescue Beanstalk::NotConnected=>e
+    puts "Beanstalk not running"
 end

data/bin/ReturnErroredMessagesToSourceQueueBunny

@@ -6,41 +6,46 @@ require "bunny"
 
 require "rservicebus"
 
-host = 'localhost:11300'
+host = 'localhost'
+port = '5672'
 errorQueueName = "error"
 
-bunny = Bunny.new(:host=>host)
-bunny.start
-direct_exchange = @bunny.exchange('rservicebus.agent')
-
-q = @bunny.queue(errorQueueName)
-
-number_of_messages = 0
-loop = true
-while loop do
-    msg = q.pop[:payload]
-    if msg == :queue_empty then
-        loop = false
-        else
-        number_of_messages++
-        
-        msg = YAML::load(msg)
-        
-		queueName = msg.getLastErrorMsg.sourceQueue
-        sq = bunny.queue(queueName)
-        sq.bind(@direct_exchange)
-        #q.publish( serialized_object )
-        
-        @direct_exchange.publish(msg)
-    end
-end
+begin
+    bunny = Bunny.new(:host=>host, :port=>port)
+    bunny.start
+    direct_exchange = bunny.exchange('rservicebus.agent')
     
+    q = bunny.queue(errorQueueName)
     
-    if count == 0 then
-        puts "Nothing waiting on the error queue"
-        else
+    number_of_messages = 0
+    loop = true
+    while loop do
+        msg = q.pop[:payload]
+        if msg == :queue_empty then
+            loop = false
+            else
+            number_of_messages++
+            
+            msg = YAML::load(msg)
+            
+            queueName = msg.getLastErrorMsg.sourceQueue
+            sq = bunny.queue(queueName)
+            sq.bind(@direct_exchange)
+            #q.publish( serialized_object )
+            
+            @direct_exchange.publish(msg)
+        end
+    end
         
-        puts "Returned #{number_of_messages} to their source queue"
         
+        if number_of_messages == 0 then
+            puts "Nothing waiting on RabbitMq error queue"
+            else
+            
+            puts "Returned #{number_of_messages} to their source queue"
+            
+        end
+        
+        rescue Bunny::ConnectionError, Bunny::ServerDownError => e
+        abort( "RabbitMq not running" )
     end
-    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -15,6 +15,7 @@ description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
 - rservicebus
+- ReturnErroredMessagesToSourceQueue
 - ReturnErroredMessagesToSourceQueueBeanstalk
 - ReturnErroredMessagesToSourceQueueBunny
 extensions: []
@@ -52,6 +53,7 @@ files:
 - lib/rservicebus/Test/Redis.rb
 - lib/rservicebus/Test.rb
 - lib/rservicebus.rb
+- bin/ReturnErroredMessagesToSourceQueue
 - bin/ReturnErroredMessagesToSourceQueueBeanstalk
 - bin/ReturnErroredMessagesToSourceQueueBunny
 - bin/rservicebus