ElmerFudd 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead68fdd2a7c88055137223d4f8a4a1090431918
-  data.tar.gz: a6aa285df35b27bb7c12521d7e35afb5a3ca54bd
+  metadata.gz: b32982e1ce69bcab0be8687c22d1df997dffd45c
+  data.tar.gz: 6f9b93f425a1ed1cba71d734f89dcf9b1c3947b1
 SHA512:
-  metadata.gz: 212d15a99a833ec4c2ee0d0c18dd401ad4bc98364605ec7ef5260420844c55402e00f3f6291c75982474e21230f6298a2bf8054306779caefc67a6259963bc92
-  data.tar.gz: c563791441eb264c2fc8f5f96b85962e9c5ad100eef7722f383fc416b9f02d3d73be9cbafdfe3587e7620997f6b72c658ff71495f4bba686430befc88af2b913
+  metadata.gz: 780c794e122c9b0cd61b767dd05974714d6da222a944e3874e6d83f4950ba5dff805c938a96ec7bd35e4a8a99d826a2d8529bf7cd1f86de3d052690902eb7fcd
+  data.tar.gz: d8bb2088f67c164cb8e649ef107d7a25c7de8abe8042a056b06ee629dfa7f7503319f0915ab7826ad434b2b40e2481fc1c482c580faf464a739aef89c5c2d632

data/lib/ElmerFudd/direct_handler.rb

@@ -3,22 +3,29 @@ module ElmerFudd
     include Filter
     attr_reader :route
 
-    def initialize(route, callback, filters)
+    def initialize(route, callback, filters, durable:)
       @route = route
       @callback = callback
       @filters = filters
+      @durable = durable
     end
 
     def queue(env)
-      env.channel.queue(@route.queue_name, durable: true, exclusive: is_exclusive_queue).tap do |queue|
+      ensure_that_queue_exists(env)
+      env.channel.queue(@route.queue_name, durable: @durable, exclusive: is_exclusive_queue).tap do |queue|
         unless @route.exchange_name == ""
           Array(@route.routing_keys).each do |routing_key|
             queue.bind(exchange(env), routing_key: routing_key)
           end
         end
+        @route.queue_name = queue.name
       end
     end
 
+    def ensure_that_queue_exists(env)
+      env.channel.queue_declare(@route.queue_name, durable: @durable, exclusive: is_exclusive_queue)
+    end
+
     def exchange(env)
       env.logger.debug "ElmerFudd Handler.exchange queue_name: #{@route.queue_name}, exchange_name: #{@route.exchange_name}, filters: #{filters_names}"
       env.channel.direct(@route.exchange_name)

data/lib/ElmerFudd/version.rb

@@ -1,3 +1,3 @@
 module ElmerFudd
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

data/lib/ElmerFudd/worker.rb

@@ -4,6 +4,11 @@ module ElmerFudd
     Env = Struct.new(:channel, :logger, :worker_class)
     Route = Struct.new(:exchange_name, :routing_keys, :queue_name)
 
+    class << self
+      attr_writer :durable_queues
+      def durable_queues; @durable_queues.nil? ? true : @durable_queues; end
+    end
+
     def self.handlers
       @handlers ||= []
     end
@@ -18,15 +23,18 @@ module ElmerFudd
     end
 
     def self.handle_event(route, filters: [], handler: nil, &block)
-      handlers << TopicHandler.new(route, handler || block, (@filters + filters + [DiscardReturnValueFilter]).uniq)
+      handlers << TopicHandler.new(route, handler || block, (@filters + filters + [DiscardReturnValueFilter]).uniq,
+                                   durable: durable_queues)
     end
 
     def self.handle_cast(route, filters: [], handler: nil, &block)
-      handlers << DirectHandler.new(route, handler || block, (@filters + filters + [DiscardReturnValueFilter]).uniq)
+      handlers << DirectHandler.new(route, handler || block, (@filters + filters + [DiscardReturnValueFilter]).uniq,
+                                    durable: durable_queues)
     end
 
     def self.handle_call(route, filters: [], handler: nil, &block)
-      handlers << RpcHandler.new(route, handler || block, (@filters + filters).uniq)
+      handlers << RpcHandler.new(route, handler || block, (@filters + filters).uniq,
+                                 durable: false)
     end
 
     # Helper allowing to use any method taking hash as a handler
@@ -55,21 +63,33 @@ module ElmerFudd
 
     def start
       self.class.handlers.each do |handler|
-        handler.queue(env).subscribe(manual_ack: true, block: false) do |delivery_info, properties, payload|
-          message = Message.new(delivery_info, properties, payload, handler.route)
-          begin
-            handler.call(env, message)
-            env.channel.acknowledge(message.delivery_info.delivery_tag)
-          rescue Exception => e
-            env.logger.fatal("Worker blocked: %s, %s:" % [e.class, e.message])
-            e.backtrace.each { |l| env.logger.fatal(l) }
-          end
-        end
+        subscribe_handler(handler)
       end
     end
 
     private
 
+    def subscribe_handler(handler)
+      handler.queue(env).subscribe(manual_ack: true, block: false,
+                                   on_cancellation: ->(*) { on_consumer_cancellation(handler) }
+                                  ) do |delivery_info, properties, payload|
+        message = Message.new(delivery_info, properties, payload, handler.route)
+        begin
+          handler.call(env, message)
+          env.channel.acknowledge(message.delivery_info.delivery_tag)
+        rescue Exception => e
+          env.logger.fatal("Worker blocked: %s, %s:" % [e.class, e.message])
+          e.backtrace.each { |l| env.logger.fatal(l) }
+        end
+      end
+    end
+
+    def on_consumer_cancellation(handler)
+      unless self.class.durable_queues
+        handler.ensure_that_queue_exists(env)
+      end
+    end
+
     def env
       @env ||= Env.new(channel, @logger, self.class)
     end
@@ -79,7 +99,11 @@ module ElmerFudd
     end
 
     def channel
-      @channel ||= connection.create_channel.tap { |c| c.prefetch(@concurrency) }
+      @channel ||= connection.create_channel
+      @channel.recover_cancelled_consumers!
+      @channel.tap do |c|
+        c.prefetch(@concurrency)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ElmerFudd
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Andrzej Sliwa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: RabbitMQ in OTP way