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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e6b031b443f44ab293d0355a716185addbf48b
-  data.tar.gz: 9542612810667662c7f2dd7c8189a0d4f665603c
+  metadata.gz: 9a8f3ad1261ef01e4087b8db07527d34c8d53e26
+  data.tar.gz: 4d3459058da480da12ca745831b3d5db695febd6
 SHA512:
-  metadata.gz: f3360fd631c0db200f929ad161a3f2e7c166ddcba0e486d384287d6997a3e4fe5169790444328220def32e495c6c60fb0c203827dd48f2138b4ae21ad4d857ee
-  data.tar.gz: a477906a046eee9bccf09dc43f957fadfd66c83d2fd389ee31f82b43d327b1bd37f18e665939ffa771ce97c7ef74d80f2b2bc7b4beeb74ecb06d032729390cef
+  metadata.gz: d2e3e9637b0404cd1c8423c5de5e84028c8933c4de3b5b2b141dc13e4fd66c3aeab71026f815637482a817c3b378c82a82a6a60fe5c94a6d9bc8da95477b0e6e
+  data.tar.gz: 714ca68654d29775fd1332ae79fd22648cd4e2040034fe22ed1c1d3dd3632688c54a70fe1d00991334abe6742f1aa59b10deb650ff1be56ae78e2eec542f1a54

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: java
 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
   requirement: !ruby/object:Gem::Requirement