splitclient-rb 8.10.0.pre.rc4 → 8.10.0.pre.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb3dfc125b557830b44424f5d6a42dbf5ba16f823d7741910020083a3e755b95
-  data.tar.gz: 940c7952301a2859e3d5f5c77b00587ec81015a2919f893aadd38adb73bad867
+  metadata.gz: fb5be51256d248db7f231bd39fafe653dd91d9c9a73d46f97430f2a3c9cf4f71
+  data.tar.gz: 693aaf493fa9d963af7a74773f0008921110c1f7f99c2175df194800c7bbc55b
 SHA512:
-  metadata.gz: 26170c1a732d710b4894a8c72b4c84a4d056fb6aa960fdfb3c91c9e7171dcd27fdd407808d4bd9684a70c9896487cdec4b9d57b8c8a9d07952eaf0f44934adee
-  data.tar.gz: 241aae97c4318d37d23284f4fb6cedc05f3991c49e4044048f8051c893177a6b0afecc80da393fa4b7d4e6037f5f09ba60e4a11381ab8d3ad2db2b653450828a
+  metadata.gz: ddc1a2958feba075b84660970e0db1e599e8c0cc2557885e0efadce9d0a0bd3f9defc73fd4330922bf539203a0a84f9ac5975f9b530e827e8877bc341ec86a80
+  data.tar.gz: f959c0a93d647e80804154c5882d3c1d87d7f339430c6c3f08fa4d890c6aaacffaa8dbcf2614dd81fde2c1f9bac3c34f28e4a440ae405262b0b011af1d6731de

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

@@ -38,7 +38,7 @@ module SplitIoClient
 
         def close(status = nil)
           unless connected?
-            log_if_debug('SSEClient already disconected.', 3)
+            @config.logger.debug('SSEClient already disconected.')
             return
           end
 
@@ -76,49 +76,54 @@ 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)
-            begin
-              partial_data = ""
-              Timeout::timeout @read_timeout do
+            if IO.select([@socket], nil, nil, @read_timeout)
+              begin
                 partial_data = @socket.readpartial(10_000)
-              end
-              read_first_event(partial_data, latch)
+                read_first_event(partial_data, latch)
 
-              raise 'eof exception' if partial_data == :eof
-            rescue Timeout::Error => 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([tcp_socket])
-              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)
+                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
+                @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
 
             process_data(partial_data)
           end
-          log_if_debug("SSE read operation exited: #{connected?}", 3)
+          @config.logger.info("SSE read operation exited: #{connected?}")
 
           nil
         end
@@ -129,7 +134,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
@@ -172,9 +177,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
@@ -185,7 +189,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)
@@ -203,7 +207,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
 
@@ -241,19 +245,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-rc4'
+  VERSION = '8.10.0-rc6'
 end

metadata

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