ElmerFudd 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74999b7aa0290bc49ca4edce1f54520a4f851410
-  data.tar.gz: 52f441ed43519db2b3d7f8f3780b79d02442e42a
+  metadata.gz: d5b2d5bbfbc2a104f309373c4b03ff275f2e14fd
+  data.tar.gz: 554fc9c97e7014ad997351adf4df84f121a5ad69
 SHA512:
-  metadata.gz: 7e245ccf3bcc2d609f391bbae6848235a3d50270d85e039501cf2d46ebcc68f6bf0e8bd625ce366f353e6109e57eed9fea19de10bb32f9c8ec20c83bccf21945
-  data.tar.gz: 72fc4d7efc690f659b7a6ae09e85f53ca1ae54a7fb133053135a54afe47b3d6cbd10905900277c1d58c7a01cc8b112906be6ac902c84b1dbea70d7c7bfc75e28
+  metadata.gz: 630f1c3c7a20700f6f286fccd8b68760ab206d6cadd11b20490276e8916402cdc2fbfda9cfff66e4657a539b8d889b11c728594b15e411a49f90e72102e80e9a
+  data.tar.gz: 7605b4d6d3f539ff5025d6ef472cc822debaf35d962063df9610c7becb06b4c89860cde4dcafdb94ff77dfcfda18e009c1e4a0e6cd52cb34aea93a84aa498193

data/lib/ElmerFudd/version.rb

@@ -1,3 +1,3 @@
 module ElmerFudd
-  VERSION = "0.0.18"
+  VERSION = "0.0.20"
 end

data/lib/ElmerFudd.rb

@@ -5,32 +5,30 @@ module ElmerFudd
   class Publisher
     def initialize(connection, uuid_service: -> { rand.to_s })
       @connection = connection
-      @channel = @connection.create_channel
-      @x = @channel.default_exchange
-      @rpc_reply_queue = @channel.queue("", exclusive: true)
       @uuid_service = uuid_service
       @topic_x = {}
     end
 
     def notify(topic_exchange, routing_key, payload)
-      @topic_x[topic_exchange] ||= @channel.topic(topic_exchange)
+      @topic_x[topic_exchange] ||= channel.topic(topic_exchange)
       @topic_x[topic_exchange].publish payload.to_s, routing_key: routing_key
       nil
     end
 
     def cast(queue_name, payload)
-      @x.publish(payload.to_s, routing_key: queue_name)
+      x.publish(payload.to_s, routing_key: queue_name)
       nil
     end
 
     def call(queue_name, payload, timeout: 10)
-      @x.publish(payload.to_s, routing_key: queue_name, reply_to: @rpc_reply_queue.name,
-                 correlation_id: correlation_id = @uuid_service.call)
+      x.publish(payload.to_s, routing_key: queue_name, reply_to: rpc_reply_queue.name,
+                correlation_id: correlation_id = @uuid_service.call)
       response = nil
       consumer_tag = @uuid_service.call
+      puts rpc_reply_queue.name
       Timeout.timeout(timeout) do
-        @rpc_reply_queue.subscribe(block: true, consumer_tag: consumer_tag) do |delivery_info, properties, payload|
-          if properties[:correlation_id] == correlation_id
+        rpc_reply_queue.subscribe(manual_ack: false, block: true, consumer_tag: consumer_tag) do |delivery_info, properties, payload|
+          if p(properties[:correlation_id]) == correlation_id
             response = payload
             delivery_info.consumer.cancel
           end
@@ -38,9 +36,33 @@ module ElmerFudd
       end
       response
     rescue Timeout::Error
-      @channel.consumers[consumer_tag].cancel
+      reply_channel.consumers[consumer_tag].cancel
       raise
     end
+
+    private
+
+    def connection
+      @connection.tap do |c|
+        c.start unless c.connected?
+      end
+    end
+
+    def x
+      @x ||= channel.default_exchange
+    end
+
+    def channel
+      @channel ||= connection.create_channel
+    end
+
+    def reply_channel
+      @reply_channel ||= connection.create_channel
+    end
+
+    def rpc_reply_queue
+      @rpc_reply_queue ||= reply_channel.queue("", exclusive: true)
+    end
   end
 
   class JsonPublisher < Publisher
@@ -59,7 +81,7 @@ module ElmerFudd
 
   class Worker
     Message = Struct.new(:delivery_info, :properties, :payload, :route)
-    Env = Struct.new(:channel, :logger)
+    Env = Struct.new(:channel, :logger, :worker_class)
     Route = Struct.new(:exchange_name, :routing_keys, :queue_name)
 
     def self.handlers
@@ -89,24 +111,38 @@ module ElmerFudd
 
     def initialize(connection, concurrency: 1, logger: Logger.new($stdout))
       @connection = connection
-      channel = connection.create_channel.tap { |c| c.prefetch(concurrency) }
-      @env = Env.new(channel, logger)
+      @concurrency = concurrency
+      @logger = logger
     end
 
     def start
       self.class.handlers.each do |handler|
-        handler.queue(@env).subscribe(manual_ack: true, block: false) do |delivery_info, properties, payload|
+        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)
+            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) }
+            env.logger.fatal("Worker blocked: %s, %s:" % [e.class, e.message])
+            e.backtrace.each { |l| env.logger.fatal(l) }
           end
         end
       end
     end
+
+    private
+
+    def env
+      @env ||= Env.new(channel, @logger, self.class)
+    end
+
+    def connection
+      @connection.tap { |c| c.start unless c.connected? }
+    end
+
+    def channel
+      @channel ||= connection.create_channel.tap { |c| c.prefetch(@concurrency) }
+    end
   end
 
   module Filter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ElmerFudd
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Andrzej Sliwa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny