banter 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eddb3c0d8d9801ac79fe7b7ca04c7f892a4cc0a
-  data.tar.gz: 03fd47b4fe7849b469ace3f1b94ca3640857cd6d
+  metadata.gz: 9f2b3a73cf906e381fe1ca04744d8417ec0ba26b
+  data.tar.gz: ef17591c856e22066c3731f5887b22b7a641ca39
 SHA512:
-  metadata.gz: fb0cf4082a90fd66772bb400106d77a2898557984b67b25a2363234b2ee5959ea199b80b41397098dbb1488d449d6178268f6af24e48722c8a71716ddfe4c2f9
-  data.tar.gz: f70da6ed9736961564bb996489927b4d5835005b11d57ac8c2ace0c11915747a63bcf1e244fb0f49549c91af72d7ec86537a365b00db6c282c00eb00ae75f2f9
+  metadata.gz: 0604404fa2508ca708f28e3e3fdb8dd9668820f1eb12a32bf6cd6e079c40028cc024347bd0076a88539a05157f34e5885b91b619a7f5d44dcc5e4e6a3cc47f7a
+  data.tar.gz: b6999995acd10379efaa21f3209053c2f44a5899653f6bb3c86720604ee0dc1415fed85488af3d9b0f38796223caf6ff6ef859bd7629aada42d683318fb6af37

data/lib/banter/server/client_queue_listener.rb

@@ -10,13 +10,12 @@ module Banter
 
       attr_reader :worker_class
 
-      def initialize(worker_class, request_key, queue_name, durable = true, topic = nil)
+      def initialize(worker_class, request_key, queue_name, durable = true, pool_size = 100, topic = nil)
         @topic        = topic || Banter::Configuration.topic_prefix
         @request_key  = request_key
         @worker_class = worker_class
-        @durable      = durable
         @queue_name   = queue_name
-        @subscriber   = ::Banter::Server::RabbitMQSubscriber.new(@request_key, @queue_name, worker_class.queue_ttl, @durable, @topic)
+        @subscriber   = ::Banter::Server::RabbitMQSubscriber.new(@request_key, @queue_name, worker_class.queue_ttl, durable, pool_size, @topic)
       end
 
       def start

data/lib/banter/server/rabbit_mq_subscriber.rb

@@ -7,11 +7,12 @@ module Banter
       attr_reader :channel
       attr_reader :ttl
 
-      def initialize(routing_key, queue_name, ttl, durable = true, topic = Banter::Configuration.topic_prefix)
+      def initialize(routing_key, queue_name, ttl, durable = true, pool_size = 100, topic = Banter::Configuration.topic_prefix)
         @initial_key = routing_key
         @durable     = durable
         @topic       = topic
         @ttl         = ttl
+        @pool_size   = pool_size
 
         if @initial_key.present?
           @routing_key = "#{@topic}.#{@initial_key}.#"
@@ -40,18 +41,9 @@ module Banter
         queue_arguments["x-dead-letter-exchange"] = Configuration.dead_letter_queue if Configuration.dead_letter_queue.present?
         queue_arguments["x-message-ttl"]          = ttl * 1000
 
-        # FIX!!! -thl
-        # Something is wrong with basic_qos because the server cannot be quickly bounced when this happens, and for messages to be
-        # quickly picked up.  It seems sporadic.  It could be a timing thing but I am unsure.
-        # Only grab 1 message at a time, otherwise, we will have to write some extra conditions to reject
-        # all the other messages that they already pulled down, which then could make the subscriber
-        # run out of memory, etc
-        # @channel.basic_qos(1)
+        @channel.basic_qos(@pool_size)
 
-        # Need to mark the queue as durable
         rabbit_queue = @channel.queue(@queue_name, durable: @durable, exclusive: false, arguments: queue_arguments)
-        # rabbit_queue = @channel.queue(@queue_name, arguments: queue_arguments)
-
         @listener                                 = rabbit_queue.bind(@exchange, routing_key: @routing_key, exclusive: false)
 
         # Parameters for subscribe that might be useful:

data/lib/banter/server/subscriber_server.rb

@@ -99,9 +99,10 @@ module Banter
         routing_key      = subscriber.subscribed_key
         durable          = subscriber.durable
         queue_name       = subscriber.generated_queue_name(routing_key, application_name)
+        pool_size        = Banter::Configuration.configuration[:pool_size] || 100
 
-        STDOUT.puts "Setting up listener for request_key: #{routing_key} and queue:#{application_name}"
-        ClientQueueListener.new(subscriber, routing_key, queue_name, durable)
+        STDOUT.puts "Setting up listener for request_key: #{routing_key} and queue:#{application_name} with qos setting: #{pool_size}"
+        ClientQueueListener.new(subscriber, routing_key, queue_name, durable, pool_size)
       end
     end
   end

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/banter/server/subscriber_server_spec.rb

@@ -8,15 +8,32 @@ describe Banter::Server::SubscriberServer do
   let!(:application_name) { "testsubscriber" }
   let!(:durable) { true }
   describe '#set_workers' do
-    before {
-      Banter::Configuration.application_name = application_name
-      allow(Banter::Server::ClientQueueListener).to receive(:new)
-      subject.set_workers([MyTestSubscriber1, MyTestSubscriber2])
-    }
-
-    it "creates queue listeners" do
-      expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber1, "foo.bar.one", "foo.bar.one_#{application_name}", durable)
-      expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber2, "foo.bar.two", "foo.bar.two_#{application_name}", durable)
+    context "default config" do
+      before {
+        Banter::Configuration.application_name = application_name
+        allow(Banter::Server::ClientQueueListener).to receive(:new)
+        subject.set_workers([MyTestSubscriber1, MyTestSubscriber2])
+      }
+
+      it "creates queue listeners" do
+        expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber1, "foo.bar.one", "foo.bar.one_#{application_name}", durable, 100)
+        expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber2, "foo.bar.two", "foo.bar.two_#{application_name}", durable, 100)
+      end
+    end
+
+    context "set pool_size" do
+      before {
+        Banter::Configuration.application_name = application_name
+        allow(Banter::Server::ClientQueueListener).to receive(:new)
+        Banter::Configuration.configuration[:pool_size] = 200
+        subject.set_workers([MyTestSubscriber1, MyTestSubscriber2])
+      }
+
+      it "creates queue listeners" do
+        expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber1, "foo.bar.one", "foo.bar.one_#{application_name}", durable, 200)
+        expect(Banter::Server::ClientQueueListener).to have_received(:new).with(MyTestSubscriber2, "foo.bar.two", "foo.bar.two_#{application_name}", durable, 200)
+      end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler