amqpop 0.0.1 → 0.0.2

data/lib/amqpop/amqpop.rb

@@ -2,6 +2,7 @@ module Amqpop
 
 	class << self
 		attr_accessor :options
+    attr_accessor :connection
 	end
 
 	self.options = nil

data/lib/amqpop/cli.rb

@@ -32,7 +32,22 @@ module Amqpop
           vputs "Running #{AMQP::VERSION} version of the AMQP gem."
           vputs "Connecting to AMQP broker on #{connection_params[:host]} as #{connection_params[:username]}."
           AMQP.connect(connection_params) do |connection|
-            AMQP::Channel.new(connection) do |channel|
+            Amqpop.connection = connection
+            connection.on_tcp_connection_loss do |cl, settings|
+              eputs "Connection to AMQP broker lost!"
+              eputs "Waiting 2 seconds to attempt to connect..."
+              cl.reconnect(true, 2)
+            end
+
+            connection.on_open do
+              vputs "Connection established"
+            end
+
+            connection.on_recovery do
+              eputs "Connection reestablished"
+            end
+
+            AMQP::Channel.new(connection, :auto_recovery => true) do |channel|
 
               channel.on_error do |ch, close|
                 eputs "ERROR: Channel-level exception: #{close.reply_text}, #{close.inspect}"
@@ -76,6 +91,8 @@ module Amqpop
     private
 
       def shutdown
+        eputs "Shutting down"
+        Amqpop.connection.disconnect unless Amqpop.connection.nil?
         EventMachine.stop
         @lock.release!
         exit 0
@@ -140,10 +157,17 @@ module Amqpop
         if Amqpop.temp_queue?
           channel.queue('', :auto_delete => true, :durable => false, :exclusive => true)
         else
-          channel.queue(options[:queue_name], :auto_delete => false, :durable => true)
+          
+          channel.queue(options[:queue_name], :auto_delete => false, :durable => true, :arguments => get_queue_args)
         end
       end
 
+      def get_queue_args
+        arguments = {}
+        arguments['x-ha-policy'] = 'all' if options[:mirror]
+        arguments
+      end
+
       def eputs(msg)
         Amqpop.eputs msg
       end
@@ -172,6 +196,7 @@ EOS
           opt :queue_name, "Name of the queue on the to connect to, unique if not provided", :type => :string, :default => ''
           opt :queue_durable, "Is the queue persistant", :default => true
           opt :queue_auto_delete, "Does the queue remove itself", :default => false
+          opt :mirror, "Does the queue mirror itself to all nodes", :default => false
           opt :exchange, "Exchange to bind the queue to. Format [name]:<routing_key>, example: logs or weather:usa.*", :type => :string, :short => "-x", :default => ''
 
           opt :wait, "Amount of time in seconds to wait for more messages to show up. Waits forever if 0", :default => 30

data/lib/amqpop/version.rb

@@ -1,3 +1,3 @@
 module Amqpop
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqpop
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Cherry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-28 00:00:00 Z
+date: 2012-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp