queuel 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    queuel (0.4.2)
+    queuel (0.4.3)
       mono_logger
       multi_json
       thread

data/lib/queuel/base/poller.rb

@@ -14,6 +14,8 @@ module Queuel
         self.inst_block = param_block
         self.tries = 0
         self.continue_looping = true
+        self.pool_tasks = 0
+        self.mutex = Mutex.new
       end
 
       def poll
@@ -30,6 +32,8 @@ module Queuel
       attr_accessor :tries
       attr_accessor :workers
       attr_accessor :inst_block
+      attr_accessor :mutex
+      attr_accessor :pool_tasks
 
       private
       attr_accessor :master
@@ -39,8 +43,8 @@ module Queuel
       attr_accessor :continue_looping
 
       def register_trappers
-        trap(:SIGINT) { shutdown }
-        trap(:INT) { shutdown }
+        trap(:SIGINT) { Thread.new{shutdown}.join }
+        trap(:INT) { Thread.new{shutdown}.join }
       end
 
       def log_action(verb, subject, level = :debug)
@@ -93,8 +97,11 @@ module Queuel
       end
 
       def process_on_thread
+        return if pool_full?
+        increment_pool_task_count
         pool.process do
           process_message
+          decrement_pool_task_count
         end
       end
 
@@ -146,7 +153,7 @@ module Queuel
       end
 
       def sleep_time
-        tries < 30 ? ((start_sleep_time + increment_sleep_time) * tries) : 3
+        tries < 30 && !pool_full? ? ((start_sleep_time + increment_sleep_time) * tries) : 3
       end
 
       def reset_tries
@@ -156,6 +163,25 @@ module Queuel
       def tried
         self.tries += 1
       end
+
+      def pool_full?
+        return false unless queue.max_pool_tasks
+        self.mutex.synchronize{
+          self.pool_tasks > queue.max_pool_tasks
+        }
+      end
+
+      def increment_pool_task_count
+        self.mutex.synchronize{
+          self.pool_tasks += 1
+        }
+      end
+
+      def decrement_pool_task_count
+        self.mutex.synchronize{
+          self.pool_tasks -= 1
+        }
+      end
     end
   end
 end

data/lib/queuel/base/queue.rb

@@ -36,6 +36,10 @@ module Queuel
         raise NotImplementedError, "must implement #size"
       end
 
+      def max_pool_tasks
+        Queuel.max_pool_tasks || nil
+      end
+
       private
       attr_accessor :client
       attr_accessor :name

data/lib/queuel/configurator.rb

@@ -54,6 +54,7 @@ module Queuel
     param :engine
     param :default_queue
     param :receiver_threads, default: 1
+    param :max_pool_tasks, deafult: nil
 
     param :decode_by_default, default: true, boolean: true
     param :decoder, default: Queuel::Serialization::Json::Decoder, validate: {

data/lib/queuel/version.rb

@@ -1,3 +1,3 @@
 module Queuel
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/queuel.rb

@@ -39,6 +39,7 @@ module Queuel
       :credentials,
       :default_queue,
       :receiver_threads,
+      :max_pool_tasks,
       :decode_by_default?,
       :decoder,
       :encode_by_default?,

data/spec/support/poller_shared_example.rb

@@ -54,17 +54,33 @@ shared_examples "a poller" do
       before do
         subject.stub quit_on_empty?: true
         queue.stub(:peek).and_return [message], nil
-        queue.stub(:approximate_number_of_messages).and_return 1, 0
         subject.stub(:pop_new_message).and_return(message, nil)
+
       end
 
       it "can poll" do
         not_for_null do
+          queue.stub(:approximate_number_of_messages).and_return 1, 0
+          queue.stub(:max_pool_tasks).and_return nil
+          block.should_receive(:call).once.and_return true
+          message.should_receive(:delete)
+          subject.poll
+        end
+      end
+
+      it "can poll with poll limit" do
+        not_for_null do
+          queue.stub(:approximate_number_of_messages).and_return 2, 1, 0
+          queue.stub(:max_pool_tasks).and_return 1
           block.should_receive(:call).once.and_return true
           message.should_receive(:delete)
+          subject.should_receive(:increment_pool_task_count).at_least(1).times
+          subject.should_receive(:decrement_pool_task_count).once
           subject.poll
         end
       end
     end
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queuel
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -403,7 +403,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2118927277156940265
+      hash: 2799856910334215195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2118927277156940265
+      hash: 2799856910334215195
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2