message_bus 2.2.0.pre.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036d535a40564744ade660423b59504db0f00dcdabfc74b910c7d0e162ce38a4
-  data.tar.gz: 0f716e13a98688301af3531c5f1a48b327139b972cc97b3fceb989855707e0a5
+  metadata.gz: 99317ae05b998644cb03be9365caf40fb7375426ea0bbbc1a165a3d6b10edf57
+  data.tar.gz: 3a0101abb11820b6225eefe0c2ac318502e05a8e2b6e0a4116adfed4b2a53864
 SHA512:
-  metadata.gz: 41c0e801c22728e69711c6cc70c387eaf64bcc9f3b3850eddea0ac576b5efe6eb244a0d6021bb20ad56f693fd05b0a9fc52a5492d04a80fa1f0656f9c0464035
-  data.tar.gz: c3ab4459396a7706987af51019eacafe61915a7c0bb60e43832e55c0c05f08a3280ac6cd41f4eccb2321ae4d931f7700633c46b0da828cb25254997c96b0cc53
+  metadata.gz: b1aca6d2cad3da7eb43febac4538396a14824cf3638afe28b1d20470b8a01b52a26039102fa87dde502d3aac4cf0c12030b8c21145aaeb591573f190765aae3e
+  data.tar.gz: c5eaac3ab21f72c235c2d408d054e0c3423f619bc298d04402e3e101517944d74bcc799fa240ce7ec11187478dc78f87875293d53998e04edb5aa62c5a3a6f9f

data/CHANGELOG

@@ -1,5 +1,11 @@
 Unreleased
 
+28-01-2019
+
+- Version 2.2.0
+
+  - FIX: Ruby HTTP Client not backing off polling on error.
+
 11-12-2018
 
 - Version 2.2.0.pre.2

data/lib/message_bus/http_client.rb

@@ -22,11 +22,11 @@ module MessageBus
   # @!attribute enable_chunked_encoding
   #   @return [Boolean] whether chunked encoding is enabled
   # @!attribute min_poll_interval
-  #   @return [Float] the min poll interval for long polling
+  #   @return [Float] the min poll interval for long polling in seconds
   # @!attribute max_poll_interval
-  #   @return [Float] the max poll interval for long polling
+  #   @return [Float] the max poll interval for long polling in seconds
   # @!attribute background_callback_interval
-  #   @return [Float] the polling interval
+  #   @return [Float] the polling interval in seconds
   class HTTPClient
     class InvalidChannel < StandardError; end
     class MissingBlock < StandardError; end
@@ -55,11 +55,11 @@ module MessageBus
     # @param base_url [String] Base URL of the message_bus server to connect to
     # @param enable_long_polling [Boolean] Enable long polling
     # @param enable_chunked_encoding [Boolean] Enable chunk encoding
-    # @param min_poll_interval [Float, Integer] Min poll interval when long polling
-    # @param max_poll_interval [Float, Integer] Max poll interval when long polling.
+    # @param min_poll_interval [Float, Integer] Min poll interval when long polling in seconds
+    # @param max_poll_interval [Float, Integer] Max poll interval when long polling in seconds.
     #   When requests fail, the client will backoff and this is the upper limit.
     # @param background_callback_interval [Float, Integer] Interval to poll when
-    #   when polling.
+    #   when polling in seconds.
     # @param headers [Hash] extra HTTP headers to be set on the polling requests.
     #
     # @return [Object] Instance of MessageBus::HTTPClient
@@ -113,6 +113,7 @@ module MessageBus
           rescue StandardError => e
             @stats.failed += 1
             warn("#{e.class} #{e.message}: #{e.backtrace.join("\n")}")
+            sleep interval
             retry
           ensure
             stop
@@ -226,7 +227,7 @@ module MessageBus
     def interval
       if @enable_long_polling
         if (failed_count = @stats.failed) > 2
-          (@min_poll_interval * failed_count).clamp(
+          (@min_poll_interval * 2**failed_count).clamp(
             @min_poll_interval, @max_poll_interval
           )
         else

data/lib/message_bus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MessageBus
-  VERSION = "2.2.0.pre.2"
+  VERSION = "2.2.0"
 end

data/spec/integration/http_client_spec.rb

@@ -40,6 +40,41 @@ describe MessageBus::HTTPClient do
 
       assert_equal(new_threads, Thread.list - threads)
     end
+
+    describe 'when an error is encountered while trying to poll' do
+      let(:base_url) { "http://0.0.0.0:12312123" }
+
+      let(:client) do
+        MessageBus::HTTPClient.new(base_url, min_poll_interval: 1)
+      end
+
+      it 'should handle errors correctly' do
+        begin
+          original_stderr = $stderr
+          $stderr = fake = StringIO.new
+
+          client.channels[channel] = MessageBus::HTTPClient::Channel.new(
+            callbacks: [-> {}]
+          )
+
+          client.start
+
+          assert_equal(MessageBus::HTTPClient::STARTED, client.status)
+
+          while stats.failed < 1 do
+            sleep 0.05
+          end
+
+          # Sleep for more than the default min_poll_interval to ensure
+          # that we sleep for the right interval after failure
+          sleep 0.5
+
+          assert_equal(1, fake.string.scan("Errno::ECONNREFUSED").size)
+        ensure
+          $stderr = original_stderr
+        end
+      end
+    end
   end
 
   describe '#subscribe' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -151,9 +151,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6