pebbles-river 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b6e0bec4e386f14856c276c287051414987cbe
-  data.tar.gz: 661538b058ac70c4decc2278acb4d964e313f68f
+  metadata.gz: 5154135c4634b945ecb355540b84513c94adcb90
+  data.tar.gz: b589add0f5307e3ca0611fd062c473ea4ca77243
 SHA512:
-  metadata.gz: dc4ca4ded39c202dc5aaba3a0b1fe4033b15eca6ba117e9b3d587a7ef3c292a806813f13429824cf29aae0be4a347cfc90b13afa28af97c18cf29afc5f60f555
-  data.tar.gz: 0977a2aa1116cbc9454c384f67430f83cb8da1334dac83da8e38af7cef70dba99b468d3bc4853dd05a54d71e9d4267abd301ce8b1d03bd8b6232849d0966c9cb
+  metadata.gz: b178f1ec13fb5916f718a3e77df7e5fe983dd40fc40bfa971e35fae2166fed6ff48e2aaf2ba5c40d4bf5177335b68182c727360565113081fd6dcc572e325152
+  data.tar.gz: d25e51b1f21784e80d10b8d8881fd08f4237ef6b1c0fc7c53dfe68fda0ea857a41eecb97ac339cdb1747de408e60ca1c80029cf6883d7a2d8144606d662a6bfe

data/lib/pebbles/river/rate_limiter.rb

@@ -0,0 +1,33 @@
+module Pebbles
+  module River
+
+    # Simple queueless token-bucket limiter.
+    class RateLimiter
+
+      def initialize(max_rate, window_seconds)
+        @last_check = Time.now
+        @max_rate = @allowance = max_rate
+        @window_seconds = window_seconds
+      end
+
+      def increment
+        now = Time.now
+        time_passed = now - @last_check
+        @last_check = now
+
+        @allowance += time_passed * (@max_rate / @window_seconds)
+        if @allowance > @max_rate
+          @allowance = @max_rate
+        end
+        if @allowance < 1
+          sleep((1 - @allowance) * (@window_seconds / @max_rate))
+          @allowance = 0
+        else
+          @allowance -= 1
+        end
+      end
+
+    end
+
+  end
+end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/lib/pebbles/river/worker.rb

@@ -49,6 +49,7 @@ module Pebbles
         @handler = handler
         @river = River.new
         @next_event_time = Time.now
+        @rate_limiter = RateLimiter.new(1.0, 10)
       end
 
       # Runs the handler once.
@@ -114,14 +115,12 @@ module Pebbles
 
         def process_next
           with_exceptions do
-            with_connection_error_handling do
-              queue.pop(auto_ack: false, ack: true) do |raw_message|
-                if raw_message[:payload] != :queue_empty
-                  process_message(raw_message)
-                  return true
-                else
-                  return false
-                end
+            queue.pop(auto_ack: false, ack: true) do |raw_message|
+              if raw_message[:payload] != :queue_empty
+                process_message(raw_message)
+                return true
+              else
+                return false
               end
             end
           end
@@ -132,7 +131,7 @@ module Pebbles
             message = Message.new(raw_message, queue)
           rescue => exception
             ignore_exceptions do
-              queue.nack(delivery_tag: message[:delivery_details][:delivery_tag])
+              queue.nack(delivery_tag: raw_message[:delivery_details][:delivery_tag])
             end
             raise exception
           else
@@ -148,34 +147,39 @@ module Pebbles
               end
               raise exception
             else
-              if result != false and @managed_acking
-                message.ack
+              if @managed_acking
+                case result
+                  when false
+                    message.nack
+                  else
+                    message.ack
+                end
               end
             end
           end
         end
 
-        def with_connection_error_handling(&block)
-          yield
-        rescue *CONNECTION_EXCEPTIONS => exception
-          if @queue
-            ignore_exceptions do
-              @queue.close
-            end
-            @queue = nil
-          end
-
-          @river.disconnect
-
-          ignore_exceptions do
-            @on_connection_error.call(exception)
-          end
-        end
-
         def with_exceptions(&block)
           begin
             yield
+          rescue *CONNECTION_EXCEPTIONS => exception
+            @rate_limiter.increment
+
+            if @queue
+              ignore_exceptions do
+                @queue.close
+              end
+              @queue = nil
+            end
+
+            @river.disconnect
+
+            ignore_exceptions do
+              @on_connection_error.call(exception)
+            end
           rescue => exception
+            @rate_limiter.increment
+
             ignore_exceptions do
               @on_exception.call(exception)
             end

data/lib/pebbles/river.rb

@@ -14,3 +14,4 @@ require_relative "river/supervisor"
 require_relative "river/routing"
 require_relative "river/river"
 require_relative "river/compatibility"
+require_relative "river/rate_limiter"

data/spec/lib/worker_spec.rb

@@ -18,6 +18,12 @@ describe Worker do
     handler
   end
 
+  let :false_handler do
+    handler = double('null_handler')
+    handler.stub(:call) { false }
+    handler
+  end
+
   let :io_error do
     IOError.new("This is not the exception you are looking for")
   end
@@ -145,6 +151,19 @@ describe Worker do
       end
     end
 
+    context 'when handler returns false' do
+      it 'nacks the message' do
+        expect(queue).to receive(:nack).at_least(1).times
+        expect(queue).to_not receive(:ack)
+        expect(queue).to_not receive(:close)
+
+        expect(river).to receive(:connected?).with(no_args).at_least(1).times
+        expect(river).to_not receive(:connect)
+
+        subject.new(false_handler, queue: {name: 'foo'}).run_once
+      end
+    end
+
     context 'when handler throws exception' do
 
       let :on_exception_callback do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
@@ -139,6 +139,7 @@ files:
 - lib/pebbles/river/compatibility.rb
 - lib/pebbles/river/errors.rb
 - lib/pebbles/river/message.rb
+- lib/pebbles/river/rate_limiter.rb
 - lib/pebbles/river/river.rb
 - lib/pebbles/river/routing.rb
 - lib/pebbles/river/subscription.rb