Fixed closing sslsocket

Author: chillaq

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

@@ -41,9 +41,12 @@ def close(status = nil)
             @config.logger.debug('SSEClient already disconected.')
             return
           end
+          @config.logger.debug("Closing SSEClient socket")
 
           @connected.make_false
+          @socket.sync_close = true
           @socket.close
+          @config.logger.debug("SSEClient socket state #{@socket.state}")
           push_status(status)
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
@@ -86,39 +89,43 @@ def connect_thread(latch)
         def connect_stream(latch)
           return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
           while connected? || @first_event.value
-            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
-                @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}")
+            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
+                  @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
-              @config.logger.error("SSE read operation timed out, no data available.")
-              return Constants::PUSH_RETRYABLE_ERROR
+            rescue Errno::EBADF
+              @config.logger.debug("SSE socket is not connected (Errno::EBADF)")
             end
 
             process_data(partial_data)

lib/splitclient-rb/version.rb

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