freddy 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c84cfbe692660ec399eb036e8e83fcc697cb8e8
-  data.tar.gz: 485a80604842982f1232a11586f53f45df824828
+  metadata.gz: 787721a42efa35a8721680b14d607b17f6b77e84
+  data.tar.gz: e12ccb2fa37c6fcd85bdb32abee295f862884c1f
 SHA512:
-  metadata.gz: da4cdbe93fc7c1371697689dc5394b125593d2c72c8abcf2380f6adaf4fae78e93d087fdece9cbcda9adde4243a211fe7b6fead6304619632b3cf784f7084813
-  data.tar.gz: 715807ff88027841c78f2d2ca1c89645f8aad845a245855a8d0911adad07d1f3e45e430c318f61d81832fdf4c0353c9137186c922820d7d01e8f2449ae807cc3
+  metadata.gz: 23aca1f868ea2871d1b2056d52a9f8264168c7ce7d8d2890ec8d2d51edcbe580aad35f908bd320aa8c6f4f41f05386613e28da71cd5bda4b3cb7586dea43d338
+  data.tar.gz: 18bc2c87a793eb9521112882a6f5353fb9fd467c9079bb5e44ac82696a19f138566bf4f880fef006bf48a0374460ece4c42c0af63a85673cc5fee1fc94ec67f8

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    freddy (0.3.7)
+    freddy (0.4.0)
       bunny (= 1.6.3)
       hamster (~> 1.0.1.pre.rc3)
       symbolizer
+      thread (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     amq-protocol (1.9.2)
-    atomic (1.1.16)
+    atomic (1.1.99)
     bunny (1.6.3)
       amq-protocol (>= 1.9.2)
     coderay (1.1.0)
@@ -37,6 +38,7 @@ GEM
     rspec-support (3.1.2)
     slop (3.6.0)
     symbolizer (0.0.1)
+    thread (0.2.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -144,10 +144,20 @@ responder_handler.destroy_destination
 ## Notes about concurrency
 
 The underlying bunny implementation uses 1 responder thread by default. This means that if there is a time-consuming process or a sleep call in a responder then other responders will not receive messages concurrently.
+To resolve this problem *freddy* uses a thread pool for running concurrent responders.
+The thread pool is shared between *tap_into* and *respond_to* callbacks and the default size is 4.
+The thread pool size can be configured by passing the configuration option *max_concurrency*.
 
-This is especially devious when using `deliver_with_response` in a responder because `deliver_with_response` creates a new anonymous responder which will not receive the response if the parent responder uses a sleep call.
 
-To resolve this problem *freddy* creates separate threads for processing. Read more from <http://rubybunny.info/articles/concurrency.html>.
+Note that while it is possible to use *deliver_with_response* inside a *respond_to* block, 
+it is not possible to use another *respond_to* block inside a different *respond_to* block.
+
+
+Note also that other configuration options for freddy users 
+such as pool sizes for DB connections need to match or exceed *max_concurrency*
+to avoid running out of resources.
+
+Read more from <http://rubybunny.info/articles/concurrency.html>.
 
 ## Credits
 

data/freddy.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "freddy"
-  spec.version       = '0.3.7'
+  spec.version       = '0.4.0'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}
@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bunny", "1.6.3"
   spec.add_dependency "symbolizer"
   spec.add_dependency "hamster", "~> 1.0.1.pre.rc3"
+  spec.add_dependency "thread", "~> 0.2"
 end

data/lib/freddy.rb

@@ -1,6 +1,7 @@
 require 'bunny'
 require 'json'
 require 'symbolizer'
+require 'thread/pool'
 
 require_relative 'freddy/consumer'
 require_relative 'freddy/producer'
@@ -68,16 +69,17 @@ class Freddy
     bunny.start
 
     channel = bunny.create_channel
-    new(channel, logger)
+    new(channel, logger, bunny_config.fetch(:max_concurrency, 4))
   end
 
   attr_reader :channel, :consumer, :producer, :request
 
-  def initialize(channel, logger)
+  def initialize(channel, logger, max_concurrency)
     @channel  = channel
-    @consumer = Consumer.new channel, logger
+    @consume_thread_pool = Thread.pool(max_concurrency)
+    @consumer = Consumer.new channel, logger, @consume_thread_pool
     @producer = Producer.new channel, logger
-    @request  = Request.new channel, logger
+    @request  = Request.new channel, logger, @producer, @consumer
   end
 
   def respond_to(destination, &callback)

data/lib/freddy/consumer.rb

@@ -9,9 +9,11 @@ class Freddy
     class EmptyConsumer < Exception
     end
 
-    def initialize(channel, logger)
+    def initialize(channel, logger, consume_thread_pool)
       @channel, @logger = channel, logger
       @topic_exchange = @channel.topic Freddy::FREDDY_TOPIC_EXCHANGE_NAME
+      @consume_thread_pool = consume_thread_pool
+      @dedicated_thread_pool = Thread.pool(1) # used only internally
     end
 
     def consume(destination, options = {}, &block)
@@ -20,21 +22,17 @@ class Freddy
     end
 
     def consume_from_queue(queue, options = {}, &block)
-      consumer = queue.subscribe options do |delivery_info, properties, payload|
-        Thread.new do
-          parsed_payload = parse_payload(payload)
-          log_receive_event(queue.name, parsed_payload)
-          block.call parsed_payload, Delivery.new(delivery_info, properties)
-        end
-      end
-      @logger.debug "Consuming messages on #{queue.name}"
-      ResponderHandler.new consumer, @channel
+      consume_using_pool(queue, options, @consume_thread_pool, &block)
+    end
+
+    def dedicated_consume(queue, &block)
+      consume_using_pool(queue, {}, @dedicated_thread_pool, &block)
     end
 
     def tap_into(pattern, &block)
       queue = @channel.queue("", exclusive: true).bind(@topic_exchange, routing_key: pattern)
       consumer = queue.subscribe do |delivery_info, properties, payload|
-        Thread.new do
+        @consume_thread_pool.process do
           block.call parse_payload(payload), delivery_info.routing_key
         end
       end
@@ -44,6 +42,18 @@ class Freddy
 
     private
 
+    def consume_using_pool(queue, options, pool, &block)
+      consumer = queue.subscribe options do |delivery_info, properties, payload|
+        pool.process do
+          parsed_payload = parse_payload(payload)
+          log_receive_event(queue.name, parsed_payload)
+          block.call parsed_payload, Delivery.new(delivery_info, properties)
+        end
+      end
+      @logger.debug "Consuming messages on #{queue.name}"
+      ResponderHandler.new consumer, @channel
+    end
+
     def parse_payload(payload)
       if payload == 'null'
         {}

data/lib/freddy/request.rb

@@ -17,9 +17,9 @@ class Freddy
     class EmptyResponder < Exception
     end
 
-    def initialize(channel, logger)
+    def initialize(channel, logger, producer, consumer)
       @channel, @logger = channel, logger
-      @producer, @consumer = Producer.new(channel, logger), Consumer.new(channel, logger)
+      @producer, @consumer = producer, consumer
       @request_map = Hamster.mutable_hash
       @request_manager = RequestManager.new @request_map, @logger
 
@@ -115,7 +115,7 @@ class Freddy
         else
           ensure_response_queue_exists
           @request_manager.start
-          @consumer.consume_from_queue @response_queue do |payload, delivery|
+          @consumer.dedicated_consume @response_queue do |payload, delivery|
             handle_response payload, delivery
           end
           @listening_for_responses = true

data/spec/integration/concurrency_spec.rb

@@ -1,34 +1,36 @@
 require 'spec_helper'
 
 describe 'Concurrency' do
-  let(:freddy) { Freddy.build(logger, config) }
+  let(:freddy1) { Freddy.build(logger, config) }
+  let(:freddy2) { Freddy.build(logger, config) }
+  let(:freddy3) { Freddy.build(logger, config) }
 
-  it 'supports nested calls in #respond_to' do
-    freddy.respond_to 'Concurrency1' do |payload, msg_handler|
+  it 'supports multiple requests in #respond_to' do
+    freddy1.respond_to 'Concurrency1' do |payload, msg_handler|
       begin
-        result = freddy.deliver_with_response 'Concurrency2', msg: 'noop'
-        msg_handler.success(result)
+        freddy1.deliver_with_response 'Concurrency2', msg: 'noop'
+        result2 = freddy1.deliver_with_response 'Concurrency3', msg: 'noop'
+        msg_handler.success(result2)
       rescue Freddy::InvalidRequestError => e
         msg_handler.error(e.response)
       end
     end
 
-    freddy.respond_to 'Concurrency2' do |payload, msg_handler|
+    freddy2.respond_to 'Concurrency2' do |payload, msg_handler|
       begin
-        result = freddy.deliver_with_response 'Concurrency3', msg: 'noop'
-        msg_handler.success(result)
+        msg_handler.success({from: 'Concurrency2'})
       rescue Freddy::InvalidRequestError => e
         msg_handler.error(e.response)
       end
     end
 
-    freddy.respond_to 'Concurrency3' do |payload, msg_handler|
+    freddy3.respond_to 'Concurrency3' do |payload, msg_handler|
       msg_handler.success({from: 'Concurrency3'})
     end
 
     result =
       begin
-        freddy.deliver_with_response 'Concurrency1', msg: 'noop'
+        freddy1.deliver_with_response 'Concurrency1', msg: 'noop'
       rescue Freddy::InvalidRequestError => e
         e.response
       end
@@ -40,18 +42,18 @@ describe 'Concurrency' do
     received1 = false
     received2 = false
 
-    freddy.tap_into 'concurrency.*.queue1' do
-      result = freddy.deliver_with_response 'TapConcurrency', msg: 'noop'
+    freddy1.tap_into 'concurrency.*.queue1' do
+      result = freddy1.deliver_with_response 'TapConcurrency', msg: 'noop'
       expect(result).to eq(from: 'TapConcurrency')
       received1 = true
     end
 
-    freddy.respond_to 'TapConcurrency' do |payload, msg_handler|
+    freddy2.respond_to 'TapConcurrency' do |payload, msg_handler|
       msg_handler.success({from: 'TapConcurrency'})
       received2 = true
     end
 
-    freddy.deliver 'concurrency.q.queue1', msg: 'noop'
+    freddy1.deliver 'concurrency.q.queue1', msg: 'noop'
 
     wait_for { received1 && received2 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1.pre.rc3
+- !ruby/object:Gem::Dependency
+  name: thread
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Messaging API
 email:
 - urmas.talimaa@gmail.com
@@ -138,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response