splitclient-rb 7.3.3.pre.rc9-java → 7.3.3.pre.rc10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7559596cd586d0f10072b19ae92405c4dbe86769
-  data.tar.gz: 33c75e02ac664366d0ad33b37b1ec189ff0dd152
+  metadata.gz: cef1d0e7796aa26ef80add139ea7cc9fbd671803
+  data.tar.gz: 7cb0de04898f2a9fc5e4c1f041bfd5f948a3aecb
 SHA512:
-  metadata.gz: 3a83f873bec9b91ae7e176cc96b247236aa9eb7e5c693ce74a7f3adb16823c42ebd4b239eb6210c981e5e37cd912943510eb21a92414025416224114bcbbb9da
-  data.tar.gz: 6775ae98766d910f269ba6a114099ed853b14ca9794c2324a3b5c0a4bbfff3bfb6de133e18ca85ab5771a03c53b88677f5ca8a6161685e6ca93b54f13fd08266
+  metadata.gz: 8991127acb956b9bb256fb4ef34f5612d9b75d0e64079c222469499729c103ee07db89e6cae4a5d57b981daaa001cd959efaff80fd958902327b033e886e8231
+  data.tar.gz: ab57a7f198719c6e9e3e0dd20c26800fc6f2b4a95be2cde03b31ce53f21abb9f65e8a04d9241fe25e948cd244135dcf57a56545708e6346350ff64fea1bbf0a5

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

@@ -8,8 +8,9 @@ module SplitIoClient
 
         unless thread.nil?
           config.logger.debug("Stopping #{thread_sym} thread...") if config.debug_enabled
-          sleep(0.1) while thread.status == 'run'
-          Thread.kill(thread)
+          config.logger.debug("################## #{thread.status}") if config.debug_enabled
+          Thread.kill thread
+          config.logger.debug("#{thread_sym} killed.") if config.debug_enabled
         end
       rescue StandardError => e
         config.logger.error(e.inspect)

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

@@ -37,7 +37,6 @@ module SplitIoClient
 
         def close(action = Constants::PUSH_NONRETRYABLE_ERROR)
           @connected.make_false
-          SplitIoClient::Helpers::ThreadHelper.stop(:connect_stream, @config)
           @socket&.close
           dispatch_action(action)
         rescue StandardError => e
@@ -72,12 +71,14 @@ module SplitIoClient
         def connect_thread(latch)
           @config.threads[:connect_stream] = Thread.new do
             @config.logger.info('Starting connect_stream thread ...') if @config.debug_enabled
-            connect_stream(latch)
+            closed_with_exception = connect_stream(latch)
+            close(closed_with_exception) unless closed_with_exception.nil?
+            @config.logger.info('connect_stream thread finished.') if @config.debug_enabled
           end
         end
 
         def connect_stream(latch)
-          socket_write(latch)
+          return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
 
           while connected? || @first_event.value
             begin
@@ -88,22 +89,23 @@ module SplitIoClient
               raise 'eof exception' if partial_data == :eof
             rescue StandardError => e
               @config.logger.error('Error reading partial data: ' + e.inspect) if @config.debug_enabled
-              close(Constants::PUSH_RETRYABLE_ERROR)
-              return
+              return Constants::PUSH_RETRYABLE_ERROR
             end
 
             process_data(partial_data)
           end
+          nil
         end
 
         def socket_write(latch)
           @first_event.make_true
           @socket = socket_connect
           @socket.write(build_request(@uri))
+          true
         rescue StandardError => e
           @config.logger.error("Error during connecting to #{@uri.host}. Error: #{e.inspect}")
-          close(Constants::PUSH_NONRETRYABLE_ERROR)
           latch.count_down
+          false
         end
 
         def read_first_event(data, latch)

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.3.3.pre.rc9'
+  VERSION = '7.3.3.pre.rc10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.3.3.pre.rc9
+  version: 7.3.3.pre.rc10
 platform: java
 authors:
 - Split Software