ldclient-rb 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743c38bedf7c153667c5a38fcc2deaffd557f09d
-  data.tar.gz: c352ed4f8c412e2c19edcbe94d5813a2478ddade
+  metadata.gz: 9a11c0c98ebb0903ef634be9bab4779e88fac992
+  data.tar.gz: 6248ed0604ba3ef0c4c7a871d7803d4fec026c9a
 SHA512:
-  metadata.gz: 6add89667ba084d57d7e49b52ced7ff279aa491aabc2285354353ce6b6f8393f14c04bef18062b1762ab6cf0bc97b27060009e589f78523fe8acaba9c9ff4a3d
-  data.tar.gz: 0a46454ca002c7fc35d15fc2343097727552cdc81ef517d96032befe77a451ddbd9e3f99b048cec5e132480c4ebb124685a8cdd282c6982f1c40844ceef7313b
+  metadata.gz: 0dd10cb337613fb44efb0492090ecedc08bdae9c279ce05af2578cdcbd199b20c7b2d314e7d6e31ce8b09c092e74ffb9187b011d5a76672c20a6ad760db445b7
+  data.tar.gz: 4105be290c1951b38d569cea473422ad5178a7ddab511e9df7accf2e1ef7d9ee60d6d3774063278f2cb45ae3aba831dc95aba62503d4acb21ac4af0f182a6620

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the LaunchDarkly Ruby SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [5.0.1] - 2018-07-02
+### Fixed:
+Fixed a regression in version 5.0.0 that could prevent the client from reconnecting if the stream connection was dropped by the server.
+
+
 ## [5.0.0] - 2018-06-26
 ### Changed:
 - The client no longer uses Celluloid for streaming I/O. Instead, it uses [socketry](https://github.com/socketry/socketry).

data/lib/ldclient-rb/version.rb

@@ -1,3 +1,3 @@
 module LaunchDarkly
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 end

data/lib/sse_client/sse_client.rb

@@ -61,6 +61,7 @@ module SSE
     def close
       if @stopped.make_true
         @cxn.close if !@cxn.nil?
+        @cxn = nil
       end
     end
 
@@ -77,6 +78,9 @@ module SSE
         @cxn = nil
         begin
           @cxn = connect
+          # There's a potential race if close was called in the middle of the previous line, i.e. after we
+          # connected but before @cxn was set. Checking the variable again is a bit clunky but avoids that.
+          return if @stopped.value
           read_stream(@cxn) if !@cxn.nil?
         rescue Errno::EBADF
           # don't log this - it probably means we closed our own connection deliberately
@@ -84,7 +88,12 @@ module SSE
           @logger.error { "Unexpected error from event source: #{e.inspect}" }
           @logger.debug { "Exception trace: #{e.backtrace}" }
         end
-        @cxn.close if !cxn.nil?
+        begin
+          @cxn.close if !@cxn.nil?
+        rescue StandardError => e
+          @logger.error { "Unexpected error while closing stream: #{e.inspect}" }
+          @logger.debug { "Exception trace: #{e.backtrace}" }
+        end
       end
     end
 

data/lib/sse_client/streaming_http.rb

@@ -1,3 +1,4 @@
+require "concurrent/atomics"
 require "http_tools"
 require "socketry"
 
@@ -15,11 +16,14 @@ module SSE
       @reader = HTTPResponseReader.new(@socket, read_timeout)
       @status = @reader.status
       @headers = @reader.headers
+      @closed = Concurrent::AtomicBoolean.new(false)
     end
 
     def close
-      @socket.close if @socket
-      @socket = nil
+      if @closed.make_true
+        @socket.close if @socket
+        @socket = nil
+      end
     end
     
     # Generator that returns one line of the response body at a time (delimited by \r, \n,

data/spec/sse_client/sse_client_spec.rb

@@ -136,4 +136,42 @@ EOT
       end
     end
   end
+
+  it "reconnects if stream returns EOF" do
+    events_body_1 = <<-EOT
+event: go
+data: foo
+
+EOT
+    events_body_2 = <<-EOT
+event: go
+data: bar
+
+EOT
+    with_server do |server|
+      attempt = 0
+      server.setup_response("/") do |req,res|
+        attempt += 1
+        if attempt == 1
+          res.body = events_body_1
+        else
+          res.body = events_body_2
+        end
+        res.content_type = "text/event-stream"
+        res.status = 200
+      end
+
+      event_sink = Queue.new
+      client = subject.new(server.base_uri,
+            reconnect_time: 0.25, read_timeout: 0.25) do |c|
+        c.on_event { |event| event_sink << event }
+      end
+
+      with_client(client) do |client|
+        expect(event_sink.pop).to eq(SSE::SSEEvent.new(:go, "foo", nil))
+        expect(event_sink.pop).to eq(SSE::SSEEvent.new(:go, "bar", nil))
+        expect(attempt).to be >= 2
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldclient-rb
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler