splitclient-rb 7.1.0.pre.rc6-java → 7.1.0.pre.rc7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1d4034e91f02d4d45f2c08494de6aa9610f73d
-  data.tar.gz: 7451b0307ff2d69d1a105529b447cf88dd181db4
+  metadata.gz: b2f25e3fbd1430c1ff7d74723cf941e2cc9ed86f
+  data.tar.gz: ba80d8b58f44a6ca5538f2e4925f4eb160a450b2
 SHA512:
-  metadata.gz: 46324be3ee7d9b518f0149e2b4c9361d6d38f57827ff5b354a8558efb4bcbbc71125d97409fcc15ad04d87bbeab85c2eb7dd8eec2fd57c8750e035b11fd1e11d
-  data.tar.gz: cbb1818d6246677debaccb87aa2ef02f830bd537f0d96cd36940211957a769de998d6567d50ff9dad7e6c70c825fc6f98469fab57d7d1e3e620ef9a2007f4591
+  metadata.gz: f7e168744f18e0851662fa560ffc18b1bcfb07b6a214794e114323334d306fc05821235f348610e63d4defafc26c62dd78dcd375acf22712f4f3f856aa918512
+  data.tar.gz: b38c2181655eed58de5baf76c7e1f091fe13cc83af8576d25173d8eccc2076fcb66ad240cba8ced8bee761d546c04c1f72c171cf90e445194c2158266708ebb7

data/lib/splitclient-rb/engine/push_manager.rb

@@ -37,10 +37,16 @@ module SplitIoClient
 
       def schedule_next_token_refresh(time)
         @config.threads[:schedule_next_token_refresh] = Thread.new do
-          @config.logger.debug("schedule_next_token_refresh refresh in #{time} seconds.") if @config.debug_enabled
-          sleep(time)
-          stop_sse
-          start_sse
+          begin
+            @config.logger.debug("schedule_next_token_refresh refresh in #{time} seconds.") if @config.debug_enabled
+            sleep(time)
+            @config.logger.debug('schedule_next_token_refresh starting ...') if @config.debug_enabled
+            stop_sse
+            sleep(1)
+            start_sse
+          rescue StandardError => e
+            @config.logger.debug("schedule_next_token_refresh error: #{e.inspect}") if @config.debug_enabled
+          end
         end
       end
     end

data/lib/splitclient-rb/helpers/thread_helper.rb

@@ -7,7 +7,7 @@ module SplitIoClient
         thread = config.threads[thread_sym]
 
         unless thread.nil?
-          config.logger.debug("Stopping #{thread_sym} ...") if config.debug_enabled
+          config.logger.debug("Stopping #{thread_sym} thread...") if config.debug_enabled
           sleep(0.1) while thread.status == 'run'
           Thread.kill(thread)
         end

data/lib/splitclient-rb/sse/event_source/client.rb

@@ -11,8 +11,7 @@ module SplitIoClient
         DEFAULT_READ_TIMEOUT = 70
         KEEP_ALIVE_RESPONSE = "c\r\n:keepalive\n\n\r\n".freeze
 
-        def initialize(url, config, read_timeout: DEFAULT_READ_TIMEOUT)
-          @uri = URI(url)
+        def initialize(config, read_timeout: DEFAULT_READ_TIMEOUT)
           @config = config
           @read_timeout = read_timeout
           @connected = Concurrent::AtomicBoolean.new(false)
@@ -22,9 +21,6 @@ module SplitIoClient
           @on = { event: ->(_) {}, connected: ->(_) {}, disconnect: ->(_) {} }
 
           yield self if block_given?
-
-          connect_thread
-          connect_passenger_forked if defined?(PhusionPassenger)
         end
 
         def on_event(&action)
@@ -42,8 +38,17 @@ module SplitIoClient
         def close
           dispatch_disconnect
           @connected.make_false
+          SplitIoClient::Helpers::ThreadHelper.stop(:connect_stream, @config)
           @socket&.close
           @socket = nil
+          @config.threads[:connect_stream] = nil
+        end
+
+        def start(url)
+          @uri = URI(url)
+
+          connect_thread
+          connect_passenger_forked if defined?(PhusionPassenger)
         end
 
         def connected?
@@ -53,7 +58,10 @@ module SplitIoClient
         private
 
         def connect_thread
-          @config.threads[:connect_stream] = Thread.new { connect_stream }
+          @config.threads[:connect_stream] = Thread.new do
+            @config.logger.info('Starting connect_stream thread ...') if @config.debug_enabled
+            connect_stream
+          end
         end
 
         def connect_passenger_forked
@@ -70,17 +78,13 @@ module SplitIoClient
 
           while @connected.value
             begin
-              partial_data = @socket.readpartial(10000, timeout: @read_timeout)
-            rescue Socketry::TimeoutError
-              @config.logger.error("Socket read time out in #{@read_timeout} seconds") if @config.debug_enabled
+              partial_data = @socket.readpartial(10_000, timeout: @read_timeout)
+            rescue StandardError => e
+              @config.logger.error(e.inspect) if @config.debug_enabled
               @connected.make_false
               @socket&.close
               @socket = nil
               connect_stream
-            rescue StandardError => e
-              @config.logger.error(e.inspect)
-              close
-              connect_stream
             end
 
             process_data(partial_data)
@@ -148,7 +152,7 @@ module SplitIoClient
 
           events
         rescue StandardError => e
-          @config.logger.debug(buffer)
+          @config.logger.error(buffer)
           @config.logger.error("Error during parsing a event: #{e.inspect}")
           []
         end

data/lib/splitclient-rb/sse/sse_handler.rb

@@ -11,6 +11,11 @@ module SplitIoClient
         @splits_worker = SplitIoClient::SSE::Workers::SplitsWorker.new(synchronizer, config, splits_repository)
         @segments_worker = SplitIoClient::SSE::Workers::SegmentsWorker.new(synchronizer, config, segments_repository)
         @notification_processor = SplitIoClient::SSE::NotificationProcessor.new(config, @splits_worker, @segments_worker)
+        @sse_client = SSE::EventSource::Client.new(@config) do |client|
+          client.on_event { |event| handle_incoming_message(event) }
+          client.on_connected { process_connected }
+          client.on_disconnect { process_disconnect }
+        end
 
         @on = { connected: ->(_) {}, disconnect: ->(_) {} }
 
@@ -19,17 +24,14 @@ module SplitIoClient
 
       def start(token_jwt, channels)
         url = "#{@config.streaming_service_url}?channels=#{channels}&v=1.1&accessToken=#{token_jwt}"
-
-        @sse_client = SSE::EventSource::Client.new(url, @config) do |client|
-          client.on_event { |event| handle_incoming_message(event) }
-          client.on_connected { process_connected }
-          client.on_disconnect { process_disconnect }
-        end
+        @sse_client.start(url)
       end
 
       def stop
-        @sse_client&.close
-        @sse_client = nil
+        @sse_client.close
+        stop_workers
+      rescue StandardError => e
+        @config.logger.debug("SSEHandler stop error: #{e.inspect}") if @config.debug_enabled
       end
 
       def connected?

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.0.pre.rc6'
+  VERSION = '7.1.0.pre.rc7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.0.pre.rc6
+  version: 7.1.0.pre.rc7
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement