splitclient-rb 7.3.3.pre.rc8 → 7.3.3.pre.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3efd7715a8d5b365643b211ee4eeefa06a7134d131d462795346d52d0afd3cab
-  data.tar.gz: 8891809092d367d14c643c391d7d0a8929b16d0635f77bda89824a85264d7861
+  metadata.gz: fdfcb65f76be36d988dd50b7a8451f9c7543928591364c0af418c480eb7d8b9f
+  data.tar.gz: 803770d7a886a327b6c3c53b9b071f18bbabebf18c9fa956198b390ef473f50e
 SHA512:
-  metadata.gz: 496077c282dc43226cfcff767c07656b2eda1cc3d8c67ff0d9d6a290db8f060e055fc506342161aa48008336f2d0db03507ba61c4255d5c3d9dc49ed13e3152f
-  data.tar.gz: 1a2209be83d551f92ee3d9f12e2e2288f284f5fa2f21aef4e9a0e49a3c2f86e71c825274a05cf0e0c31ceff9257ee4baa7536f62639464cd4e2186475d41594f
+  metadata.gz: 529234623f76a2b3ca5fd1ab9fba37546545c82c6ce9a7d792e264aec7b6eda4464a5804ecac447ce08b46f99b12eb1654fbca10741e1e1f5352dc37fb07cab6
+  data.tar.gz: 194fcc2c307d2c3d7844b952a3666d2505f5bac3b87e5d28bed22adc2eec476af8c6318dc175bde0cb9007869884d50375f1743a071fba46d32989e430b5086a

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

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

@@ -36,10 +36,14 @@ module SplitIoClient
         end
 
         def close(action = Constants::PUSH_NONRETRYABLE_ERROR)
-          dispatch_action(action)
+          unless connected?
+            @config.logger.error('SSEClient already disconected.') if @config.debug_enabled
+            return
+          end
+
           @connected.make_false
-          SplitIoClient::Helpers::ThreadHelper.stop(:connect_stream, @config)
           @socket&.close
+          dispatch_action(action)
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
         end
@@ -71,13 +75,17 @@ module SplitIoClient
 
         def connect_thread(latch)
           @config.threads[:connect_stream] = Thread.new do
+            @config.logger.error('# CONNECT THREAD')
             @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
+            @config.logger.error('# DISCONNECTED THREAD')
           end
         end
 
         def connect_stream(latch)
-          socket_write(latch)
+          return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
 
           while connected? || @first_event.value
             begin
@@ -86,24 +94,28 @@ module SplitIoClient
               read_first_event(partial_data, latch)
 
               raise 'eof exception' if partial_data == :eof
+            rescue Errno::EBADF, IOError => e
+              @config.logger.error(e.inspect)
+              return nil
             rescue StandardError => e
-              @config.logger.error('Error reading partial data: ' + e.inspect) if @config.debug_enabled
-              close(Constants::PUSH_RETRYABLE_ERROR)
-              return
+              @config.logger.error("Error reading partial data: #{e.inspect}") if @config.debug_enabled
+              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.rc8'
+  VERSION = '7.3.3.pre.rc12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.3.3.pre.rc8
+  version: 7.3.3.pre.rc12
 platform: ruby
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allocation_stats