splitclient-rb 8.10.0.pre.rc5 → 8.10.0.pre.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1c96c4c828e35b92aab1832e76f5b3e86b430d1c96063837b44e7149aa1cd8
-  data.tar.gz: e35412918b839f46cc7f547f7f1f1ac8f8163ab7d1c47de79a4ed013dc78b5eb
+  metadata.gz: 996c61b1cd0a431ef21c5dff6eda92b553d96f81586470b89e7bbe49d2625923
+  data.tar.gz: 25643beb6250dd2e34e0e2d324ac4559ceeeb57a965ab7aeade1ce7cb73810ed
 SHA512:
-  metadata.gz: 57c47112c8de1cd38bde1bc462d67ce3f5bb63eb41b6c775fe08591c24e991938c89ed4fd1d48f05008c897dd7af7e79da08578e17a9919db2d547c3b746d6d6
-  data.tar.gz: 3541514099aef7a845b89eda8924e307916b7b1f32aff5406054907ac7823f2c9014d0352bb9cc7c6e781d84970de9eeb0a5d8a87afade7ecc8ec7aa8586a824
+  metadata.gz: 446a6dfd308323b5136b4f521e74e5d619cb49f2241f51ca446b8052997fc501485571f4ec45b1f12d17187bd308b4084d6b903a1c080da93cfc94a25f0caa74
+  data.tar.gz: 6b7b280649134be59a443c1a95838aa524ba4046a0948c2de2fc2faabcb288a66e0736dcd02196eddfdf3e0881e71d8a128ff86f1959b8b9a3b3bd621af3d5df

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

@@ -38,12 +38,15 @@ module SplitIoClient
 
         def close(status = nil)
           unless connected?
-            log_if_debug('SSEClient already disconected.', 3)
+            @config.logger.debug('SSEClient already disconected.')
             return
           end
+          @config.logger.debug("Closing SSEClient socket")
 
           @connected.make_false
+          @socket.sync_close = true if @socket.is_a? OpenSSL::SSL::SSLSocket
           @socket.close
+          @config.logger.debug("SSEClient socket state #{@socket.state}") if @socket.is_a? OpenSSL::SSL::SSLSocket
           push_status(status)
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
@@ -57,7 +60,6 @@ module SplitIoClient
 
           @uri = URI(url)
           latch = Concurrent::CountDownLatch.new(1)
-
           connect_thread(latch)
 
           return false unless latch.wait(CONNECT_TIMEOUT)
@@ -76,56 +78,65 @@ module SplitIoClient
 
         def connect_thread(latch)
           @config.threads[:connect_stream] = Thread.new do
-            log_if_debug('Starting connect_stream thread ...', 2)
+            @config.logger.info('Starting connect_stream thread ...')
             new_status = connect_stream(latch)
             push_status(new_status)
-            log_if_debug('connect_stream thread finished.', 2)
+            @config.logger.info('connect_stream thread finished.')
           end
         end
 
         def connect_stream(latch)
           return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
           while connected? || @first_event.value
-            log_if_debug("Inside coonnect_stream while loop.", 3)
-            if IO.select([@socket], nil, nil, @read_timeout)
-              begin
-                partial_data = @socket.readpartial(10_000)
-                read_first_event(partial_data, latch)
-
-                raise 'eof exception' if partial_data == :eof
-              rescue IO::WaitReadable => e
-                log_if_debug("SSE client transient error: #{e.inspect}", 1)
-                IO.select([@socket], nil, nil, @read_timeout)
-                retry
-              rescue Errno::ETIMEDOUT => e
-                log_if_debug("SSE read operation timed out!: #{e.inspect}", 3)
-                return Constants::PUSH_RETRYABLE_ERROR
-              rescue EOFError => e
-                log_if_debug("SSE read operation EOF Exception!: #{e.inspect}", 3)
-                raise 'eof exception'
-              rescue  Errno::EAGAIN => e
-                log_if_debug("SSE client transient error: #{e.inspect}", 1)
-                IO.select([@socket], nil, nil, @read_timeout)
-                retry
-              rescue Errno::EBADF, IOError => e
-                log_if_debug("SSE read operation EBADF or IOError: #{e.inspect}", 3)
-                return nil
-              rescue StandardError => e
-                log_if_debug("SSE read operation StandardError: #{e.inspect}", 3)
-                return nil if ENV['SPLITCLIENT_ENV'] == 'test'
-
-                log_if_debug("Error reading partial data: #{e.inspect}", 3)
+            begin 
+              if IO.select([@socket], nil, nil, @read_timeout)
+                begin
+                  partial_data = @socket.readpartial(10_000)
+                  read_first_event(partial_data, latch)
+
+                  raise 'eof exception' if partial_data == :eof
+                rescue IO::WaitReadable => e
+                  @config.logger.debug("SSE client IO::WaitReadable transient error: #{e.inspect}")
+                  IO.select([@socket], nil, nil, @read_timeout)
+                  retry
+                rescue  Errno::EAGAIN => e
+                  @config.logger.debug("SSE client transient error: #{e.inspect}")
+                  IO.select([@socket], nil, nil, @read_timeout)
+                  retry
+                rescue Errno::ETIMEDOUT => e
+                  @config.logger.error("SSE read operation timed out!: #{e.inspect}")
+                  return Constants::PUSH_RETRYABLE_ERROR
+                rescue EOFError => e
+                  puts "SSE read operation EOF Exception!: #{e.inspect}"
+                  @config.logger.error("SSE read operation EOF Exception!: #{e.inspect}")
+                  raise 'eof exception'
+                rescue Errno::EBADF, IOError => e
+                  @config.logger.error("SSE read operation EBADF or IOError: #{e.inspect}")
+                  return Constants::PUSH_RETRYABLE_ERROR
+                rescue StandardError => e
+                  @config.logger.error("SSE read operation StandardError: #{e.inspect}")
+                  return nil if ENV['SPLITCLIENT_ENV'] == 'test'
+
+                  @config.logger.error("Error reading partial data: #{e.inspect}")
+                  return Constants::PUSH_RETRYABLE_ERROR
+                end
+              else
+                @config.logger.error("SSE read operation timed out, no data available.")
                 return Constants::PUSH_RETRYABLE_ERROR
               end
-            else
-              # Timeout occurred, no data available
-              log_if_debug("SSE read operation timed out, no data available.", 3)
-              return Constants::PUSH_RETRYABLE_ERROR
+            rescue Errno::EBADF
+              @config.logger.debug("SSE socket is not connected (Errno::EBADF)")
+              break
+            rescue RuntimeError
+              raise 'eof exception'
+            rescue Exception => e
+              @config.logger.debug("SSE socket is not connected: #{e.inspect}")
+              break
             end
 
             process_data(partial_data)
           end
-          log_if_debug("SSE read operation exited: #{connected?}", 3)
+          @config.logger.info("SSE read operation exited: #{connected?}")
 
           nil
         end
@@ -136,7 +147,7 @@ module SplitIoClient
           @socket.puts(build_request(@uri))
           true
         rescue StandardError => e
-          log_if_debug("Error during connecting to #{@uri.host}. Error: #{e.inspect}", 3)
+          @config.logger.error("Error during connecting to #{@uri.host}. Error: #{e.inspect}")
           latch.count_down
           false
         end
@@ -179,9 +190,8 @@ module SplitIoClient
                 IO.select(nil, [ssl_socket])
                 retry
               end
-
               return ssl_socket
-#              return ssl_socket.connect 
+
             rescue Exception => e
               @config.logger.error("socket connect error: #{e.inspect}")
               return nil
@@ -192,7 +202,7 @@ module SplitIoClient
         end
 
         def process_data(partial_data)
-          log_if_debug("Event partial data: #{partial_data}", 1)
+          @config.logger.debug("Event partial data: #{partial_data}")
           return if partial_data.nil? || partial_data == KEEP_ALIVE_RESPONSE
 
           events = @event_parser.parse(partial_data)
@@ -210,7 +220,7 @@ module SplitIoClient
           req << "SplitSDKMachineName: #{@config.machine_name}\r\n"
           req << "SplitSDKClientKey: #{@api_key.split(//).last(4).join}\r\n" unless @api_key.nil?
           req << "Cache-Control: no-cache\r\n\r\n"
-          log_if_debug("Request info: #{req}", 1)
+          @config.logger.debug("Request info: #{req}")
           req
         end
 
@@ -248,19 +258,6 @@ module SplitIoClient
           @config.logger.debug("Pushing new sse status: #{status}")
           @status_queue.push(status)
         end
-
-        def log_if_debug(text, level)
-          if @config.debug_enabled
-            case level
-            when 1
-              @config.logger.debug(text)
-            when 2
-              @config.logger.info(text)
-            else
-              @config.logger.error(text)
-            end
-          end
-        end
       end
     end
   end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.10.0-rc5'
+  VERSION = '8.10.0-rc7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 8.10.0.pre.rc5
+  version: 8.10.0.pre.rc7
 platform: ruby
 authors:
 - Split Software