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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6fc8163dee8d303228ac119e0d704bd827b00c2a4dd6408cef7af1c7f35767
-  data.tar.gz: 841be300c51ec06e5abc3b916ab69efeb42bfb15efc36179673dcefce7fd2165
+  metadata.gz: 26ed225fcda5a6c69eb42dd34caec716320192c5dde6b53f38b8e8ee0e0006cf
+  data.tar.gz: b206d8c015265fdc3fa07f12100b9edbdaece2ff37c6af3520c51a166c52a324
 SHA512:
-  metadata.gz: 2fa16a7e50e717f9f0af64d8159a586ca9ece0dcba1c4f56914f73064a07c2fe30edc70ce9460fab3e5cd9282885179a4a4479dcbc613e569c926e9c31d09b57
-  data.tar.gz: b6e45d41dc353aeca5cb98f666814d57d9481cb8844fdd7170647dead43071a8fbe76d30a7ee45aceb8f4dd43c317bb5806dd20a4e538d64e7e888c0f50c0a81
+  metadata.gz: e8d470474c3996b57c2e3c4e5752d636a93fba3200fdb6ea6a88e233ae2a4a8631c1eb113a0052a9e4f6c48be9a4863f7e37e3af89b3e900b85bc55b18942fe6
+  data.tar.gz: 2091bdddd0bdbe6a0221a45ebd9e6559f541073bb697b34b3a6443244ede79e78bca487e21900fa23eaacb95e8a114c3caea9c5125faa14b80f0765cdb33ab97

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: ruby
 authors:
 - Split Software