splitclient-rb 7.1.0.pre.rc4-java → 7.1.0.pre.rc5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3773978239a090c92def574c430f8b4fae75b8aa
-  data.tar.gz: ddf8b97ce2c9b5f429a2e69d0b20545067a59e3e
+  metadata.gz: 5c1a2428506b9886365ced5a75c964382e3187c3
+  data.tar.gz: c4b8a9f6b25f71ce404a3bcd8cdb3797d75b4026
 SHA512:
-  metadata.gz: 0fedca3dbb628ca64f46f72b516e7ab8add756746b10bf95de2579b2f007f700e5c4c8db7c2a326034b2ccc528fb4cdf3274543301167cad9b7f0c2bcbc4f9b6
-  data.tar.gz: a2ea5d71f11ddef491e89b168b837ebe3a692f83b6664ba7dee913f036b13b7947bcc821d1f8f9c266fddecdeb999801d131d711acbde6c10a14a851cb1eb8ff
+  metadata.gz: 409c8765f7f9cc09cdc0cfd087fb58f67232b033794ef82dd7c517a35893bb654f804e9dd71abaac612b5154f23f4a32b6b79926341a699187acf90e4a56211d
+  data.tar.gz: 570b3fd5c0e0d5d748eb448ae61f6825f3c936ddee5f4de2b1555a318ec85a8888fcf1a30725bcacd9180434cf8dfdaf77e0825221b5610d0f3137674d4c5277

data/.rubocop.yml

@@ -15,6 +15,12 @@ Metrics/LineLength:
   Exclude:
     - spec/sse/**/*
     - spec/integrations/**/*
+    - spec/engine/sync_manager_spec.rb
+
+Style/BracesAroundHashParameters:
+  Exclude:
+    - spec/integrations/push_client_spec.rb
+    - spec/engine/synchronizer_spec.rb
 
 Metrics/BlockLength:
   Exclude:

data/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb

@@ -28,9 +28,13 @@ module SplitIoClient
         end
 
         def fetch_segment(name)
-          @semaphore.synchronize { segments_api.fetch_segments_by_names([name]) }
+          @semaphore.synchronize do
+            segments_api.fetch_segments_by_names([name])
+            true
+          end
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
+          false
         end
 
         def fetch_segments
@@ -51,7 +55,7 @@ module SplitIoClient
 
         def segments_thread
           @config.threads[:segment_fetcher] = Thread.new do
-            @config.logger.info('Starting segments fetcher service')
+            @config.logger.info('Starting segments fetcher service') if @config.debug_enabled
 
             loop do
               next unless @sdk_blocker.splits_repository.ready?

data/lib/splitclient-rb/cache/fetchers/split_fetcher.rb

@@ -41,9 +41,11 @@ module SplitIoClient
             @config.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if @config.debug_enabled
 
             @sdk_blocker.splits_ready!
+            true
           end
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
+          false
         end
 
         def stop_splits_thread
@@ -54,7 +56,7 @@ module SplitIoClient
 
         def splits_thread
           @config.threads[:split_fetcher] = Thread.new do
-            @config.logger.info('Starting splits fetcher service')
+            @config.logger.info('Starting splits fetcher service') if @config.debug_enabled
             loop do
               fetch_splits
 

data/lib/splitclient-rb/constants.rb

@@ -5,5 +5,6 @@ class SplitIoClient::Constants
   CONTROL_PRI = 'control_pri'
   CONTROL_SEC = 'control_sec'
   OCCUPANCY_CHANNEL_PREFIX = '[?occupancy=metrics.publishers]'
+  FETCH_BACK_OFF_BASE_RETRIES = 1
 end
   

data/lib/splitclient-rb/engine/auth_api_client.rb

@@ -41,7 +41,7 @@ module SplitIoClient
         channels_hash = JSON.parse(capability)
         channels_string = channels_hash.keys.join(',')
         channels_string = control_channels(channels_string)
-        @config.logger.debug("Channels #{channels_string}")
+        @config.logger.debug("Channels #{channels_string}") if @config.debug_enabled
         CGI.escape(channels_string)
       end
 
@@ -50,7 +50,7 @@ module SplitIoClient
       end
 
       def process_success(response)
-        @config.logger.debug("Success connection to: #{@config.auth_service_url}")
+        @config.logger.debug("Success connection to: #{@config.auth_service_url}") if @config.debug_enabled
 
         body_json = JSON.parse(response.body, symbolize_names: true)
         push_enabled = body_json[:pushEnabled]

data/lib/splitclient-rb/engine/push_manager.rb

@@ -8,13 +8,13 @@ module SplitIoClient
         @sse_handler = sse_handler
         @auth_api_client = AuthApiClient.new(@config)
         @api_key = api_key
-        @back_off = SplitIoClient::SSE::EventSource::BackOff.new(@config.auth_retry_back_off_base)
+        @back_off = SplitIoClient::SSE::EventSource::BackOff.new(@config.auth_retry_back_off_base, 1)
       end
 
       def start_sse
         response = @auth_api_client.authenticate(@api_key)
 
-        @config.logger.debug("Auth service response push_enabled: #{response[:push_enabled]}")
+        @config.logger.debug("Auth service response push_enabled: #{response[:push_enabled]}") if @config.debug_enabled
         if response[:push_enabled]
           @sse_handler.start(response[:token], response[:channels])
           schedule_next_token_refresh(response[:exp])

data/lib/splitclient-rb/engine/sync_manager.rb

@@ -59,7 +59,7 @@ module SplitIoClient
         @synchronizer.start_periodic_fetch
         @synchronizer.start_periodic_data_recording
       rescue StandardError => e
-        @config.logger.error(e)
+        @config.logger.error("start_poll error : #{e.inspect}")
       end
 
       # Starts thread which fetch splits and segments once and trigger task to periodic data recording.
@@ -69,7 +69,7 @@ module SplitIoClient
             @synchronizer.sync_all
             @synchronizer.start_periodic_data_recording
           rescue StandardError => e
-            @config.logger.error(e)
+            @config.logger.error("stream_start_thread error : #{e.inspect}")
           end
         end
       end
@@ -80,7 +80,7 @@ module SplitIoClient
           begin
             @push_manager.start_sse
           rescue StandardError => e
-            @config.logger.error(e)
+            @config.logger.error("stream_start_sse_thread error : #{e.inspect}")
           end
         end
       end
@@ -97,24 +97,29 @@ module SplitIoClient
         @synchronizer.stop_periodic_fetch
         @synchronizer.sync_all
         @sse_handler.start_workers
+      rescue StandardError => e
+        @config.logger.error("process_connected error: #{e.inspect}")
       end
 
       def process_disconnect
         @sse_handler.stop_workers
         @synchronizer.start_periodic_fetch
+      rescue StandardError => e
+        @config.logger.error("process_disconnect error: #{e.inspect}")
       end
 
       def process_occupancy(push_enable)
         process_disconnect unless push_enable
         process_connected if push_enable
+      rescue StandardError => e
+        @config.logger.error("process_occupancy error: #{e.inspect}")
       end
 
       def process_push_shutdown
-        @sse_handler.stop_workers
         @push_manager.stop_sse
-        start_poll
+        process_disconnect
       rescue StandardError => e
-        @config.logger.error(e)
+        @config.logger.error("process_push_shutdown error: #{e.inspect}")
       end
     end
   end

data/lib/splitclient-rb/engine/synchronizer.rb

@@ -26,7 +26,7 @@ module SplitIoClient
       end
 
       def sync_all
-        @config.logger.debug('Synchronizing Splits and Segments ...')
+        @config.logger.debug('Synchronizing Splits and Segments ...') if @config.debug_enabled
         fetch_splits
         fetch_segments
       end
@@ -48,11 +48,21 @@ module SplitIoClient
       end
 
       def fetch_splits
-        @split_fetcher.fetch_splits
+        back_off = SplitIoClient::SSE::EventSource::BackOff.new(SplitIoClient::Constants::FETCH_BACK_OFF_BASE_RETRIES, 1)
+        loop do
+          break if @split_fetcher.fetch_splits
+
+          sleep(back_off.interval)
+        end
       end
 
       def fetch_segment(name)
-        @segment_fetcher.fetch_segment(name)
+        back_off = SplitIoClient::SSE::EventSource::BackOff.new(SplitIoClient::Constants::FETCH_BACK_OFF_BASE_RETRIES, 1)
+        loop do
+          break if @segment_fetcher.fetch_segment(name)
+
+          sleep(back_off.interval)
+        end
       end
 
       private

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

@@ -7,12 +7,18 @@ module SplitIoClient
         thread = config.threads[thread_sym]
 
         unless thread.nil?
-          config.logger.debug("Stopping #{thread_sym} ...")
+          config.logger.debug("Stopping #{thread_sym} ...") if config.debug_enabled
           sleep(0.1) while thread.status == 'run'
           Thread.kill(thread)
         end
-      rescue StandardError => error
-        config.logger.error(error.inspect)
+      rescue StandardError => e
+        config.logger.error(e.inspect)
+      end
+
+      def self.alive?(thread_sym, config)
+        thread = config.threads[thread_sym]
+
+        thread.nil? ? false : thread.alive?
       end
     end
   end

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

@@ -4,8 +4,8 @@ module SplitIoClient
   module SSE
     module EventSource
       class BackOff
-        def initialize(back_off_base)
-          @attempt = 0
+        def initialize(back_off_base, attempt = 0)
+          @attempt = attempt
           @back_off_base = back_off_base
         end
 

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

@@ -64,7 +64,7 @@ module SplitIoClient
           interval = @back_off.interval
           sleep(interval) if interval.positive?
 
-          @config.logger.info("Connecting to #{@uri.host}...")
+          @config.logger.info("Connecting to #{@uri.host}...") if @config.debug_enabled
 
           socket_write
 
@@ -72,7 +72,13 @@ module SplitIoClient
             begin
               partial_data = @socket.readpartial(2048, timeout: @read_timeout)
             rescue Socketry::TimeoutError
-              @config.logger.error("Socket read time out in #{@read_timeout} seconds")
+              @config.logger.error("Socket read time out in #{@read_timeout} seconds") if @config.debug_enabled
+              @connected.make_false
+              @socket&.close
+              @socket = nil
+              connect_stream
+            rescue StandardError => e
+              @config.logger.error(e.inspect)
               close
               connect_stream
             end
@@ -98,7 +104,7 @@ module SplitIoClient
 
         def process_data(partial_data)
           unless partial_data.nil? || partial_data == KEEP_ALIVE_RESPONSE
-            @config.logger.debug("Event partial data: #{partial_data}")
+            @config.logger.debug("Event partial data: #{partial_data}") if @config.debug_enabled
             buffer = read_partial_data(partial_data)
             events = parse_event(buffer)
 
@@ -113,7 +119,7 @@ module SplitIoClient
           req << "Host: #{uri.host}\r\n"
           req << "Accept: text/event-stream\r\n"
           req << "Cache-Control: no-cache\r\n\r\n"
-          @config.logger.debug("Request info: #{req}")
+          @config.logger.debug("Request info: #{req}") if @config.debug_enabled
           req
         end
 
@@ -142,6 +148,7 @@ module SplitIoClient
 
           events
         rescue StandardError => e
+          @config.logger.debug(buffer)
           @config.logger.error("Error during parsing a event: #{e.inspect}")
           []
         end
@@ -160,7 +167,7 @@ module SplitIoClient
           events.each do |event|
             raise SSEClientException.new(event), 'Error event' if event.event_type == 'error'
 
-            @config.logger.debug("Dispatching event: #{event.event_type}, #{event.channel}")
+            @config.logger.debug("Dispatching event: #{event.event_type}, #{event.channel}") if @config.debug_enabled
             @on[:event].call(event)
           end
         rescue SSEClientException => e
@@ -171,12 +178,12 @@ module SplitIoClient
         def dispatch_connected
           @connected.make_true
           @back_off.reset
-          @config.logger.debug('Dispatching connected')
+          @config.logger.debug('Dispatching connected') if @config.debug_enabled
           @on[:connected].call
         end
 
         def dispatch_disconnect
-          @config.logger.debug('Dispatching disconnect')
+          @config.logger.debug('Dispatching disconnect') if @config.debug_enabled
           @on[:disconnect].call
         end
       end

data/lib/splitclient-rb/sse/notification_manager_keeper.rb

@@ -47,9 +47,7 @@ module SplitIoClient
       end
 
       def process_event_occupancy(publishers)
-        @config.logger.debug(
-          "Occupancy process event with #{publishers} publishers and polling on: #{@publisher_available.value}"
-        )
+        @config.logger.debug("Occupancy process event with #{publishers} publishers") if @config.debug_enabled
         if publishers <= 0 && @publisher_available.value
           @publisher_available.make_false
           dispatch_occupancy_event(false)

data/lib/splitclient-rb/sse/notification_processor.rb

@@ -25,12 +25,12 @@ module SplitIoClient
       private
 
       def process_split_update(notification)
-        @config.logger.debug("SPLIT UPDATE notification received: #{notification}")
+        @config.logger.debug("SPLIT UPDATE notification received: #{notification}") if @config.debug_enabled
         @splits_worker.add_to_queue(notification.data['changeNumber'])
       end
 
       def process_split_kill(notification)
-        @config.logger.debug("SPLIT KILL notification received: #{notification}")
+        @config.logger.debug("SPLIT KILL notification received: #{notification}") if @config.debug_enabled
         change_number = notification.data['changeNumber']
         default_treatment = notification.data['defaultTreatment']
         split_name = notification.data['splitName']
@@ -39,7 +39,7 @@ module SplitIoClient
       end
 
       def process_segment_update(notification)
-        @config.logger.debug("SEGMENT UPDATE notification received: #{notification}")
+        @config.logger.debug("SEGMENT UPDATE notification received: #{notification}") if @config.debug_enabled
         change_number = notification.data['changeNumber']
         segment_name = notification.data['segmentName']
 

data/lib/splitclient-rb/sse/sse_handler.rb

@@ -10,7 +10,6 @@ module SplitIoClient
         @notification_manager_keeper = notification_manager_keeper
         @splits_worker = SplitIoClient::SSE::Workers::SplitsWorker.new(synchronizer, config, splits_repository)
         @segments_worker = SplitIoClient::SSE::Workers::SegmentsWorker.new(synchronizer, config, segments_repository)
-        @control_worker = SplitIoClient::SSE::Workers::ControlWorker.new(config)
         @notification_processor = SplitIoClient::SSE::NotificationProcessor.new(config, @splits_worker, @segments_worker)
 
         @on = { connected: ->(_) {}, disconnect: ->(_) {} }
@@ -40,13 +39,11 @@ module SplitIoClient
       def start_workers
         @splits_worker.start
         @segments_worker.start
-        @control_worker.start
       end
 
       def stop_workers
         @splits_worker.stop
         @segments_worker.stop
-        @control_worker.stop
       end
 
       def on_connected(&action)

data/lib/splitclient-rb/sse/workers/segments_worker.rb

@@ -8,15 +8,20 @@ module SplitIoClient
           @synchronizer = synchronizer
           @config = config
           @segments_repository = segments_repository
-          @queue = Queue.new
+          @queue = nil
         end
 
         def start
+          return if SplitIoClient::Helpers::ThreadHelper.alive?(:segment_update_worker, @config)
+
+          @queue = Queue.new
           perform_thread
           perform_passenger_forked if defined?(PhusionPassenger)
         end
 
         def add_to_queue(change_number, segment_name)
+          return if @queue.nil?
+
           item = { change_number: change_number, segment_name: segment_name }
           @config.logger.debug("SegmentsWorker add to queue #{item}")
           @queue.push(item)
@@ -24,6 +29,7 @@ module SplitIoClient
 
         def stop
           SplitIoClient::Helpers::ThreadHelper.stop(:segment_update_worker, @config)
+          @queue = nil
         end
 
         private
@@ -43,7 +49,7 @@ module SplitIoClient
 
         def perform_thread
           @config.threads[:segment_update_worker] = Thread.new do
-            @config.logger.debug('Starting segments worker ...')
+            @config.logger.debug('Starting segments worker ...') if @config.debug_enabled
             perform
           end
         end

data/lib/splitclient-rb/sse/workers/splits_worker.rb

@@ -8,20 +8,26 @@ module SplitIoClient
           @synchronizer = synchronizer
           @config = config
           @splits_repository = splits_repository
-          @queue = Queue.new
         end
 
         def start
+          return if SplitIoClient::Helpers::ThreadHelper.alive?(:split_update_worker, @config)
+
+          @queue = Queue.new
           perform_thread
           perform_passenger_forked if defined?(PhusionPassenger)
         end
 
         def add_to_queue(change_number)
+          return if @queue.nil?
+
           @config.logger.debug("SplitsWorker add to queue #{change_number}")
           @queue.push(change_number)
         end
 
         def kill_split(change_number, split_name, default_treatment)
+          return if @queue.nil?
+
           @config.logger.debug("SplitsWorker kill #{split_name}, #{change_number}")
           @splits_repository.kill(change_number, split_name, default_treatment)
           add_to_queue(change_number)
@@ -29,6 +35,7 @@ module SplitIoClient
 
         def stop
           SplitIoClient::Helpers::ThreadHelper.stop(:split_update_worker, @config)
+          @queue = nil
         end
 
         private
@@ -46,7 +53,7 @@ module SplitIoClient
 
         def perform_thread
           @config.threads[:split_update_worker] = Thread.new do
-            @config.logger.debug('Starting splits worker ...')
+            @config.logger.debug('Starting splits worker ...') if @config.debug_enabled
             perform
           end
         end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.0.pre.rc4'
+  VERSION = '7.1.0.pre.rc5'
 end

data/lib/splitclient-rb.rb

@@ -98,7 +98,6 @@ require 'splitclient-rb/sse/event_source/back_off'
 require 'splitclient-rb/sse/event_source/client'
 require 'splitclient-rb/sse/event_source/event_types'
 require 'splitclient-rb/sse/event_source/stream_data'
-require 'splitclient-rb/sse/workers/control_worker'
 require 'splitclient-rb/sse/workers/segments_worker'
 require 'splitclient-rb/sse/workers/splits_worker'
 require 'splitclient-rb/sse/notification_manager_keeper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.0.pre.rc4
+  version: 7.1.0.pre.rc5
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +420,6 @@ files:
 - lib/splitclient-rb/sse/notification_manager_keeper.rb
 - lib/splitclient-rb/sse/notification_processor.rb
 - lib/splitclient-rb/sse/sse_handler.rb
-- lib/splitclient-rb/sse/workers/control_worker.rb
 - lib/splitclient-rb/sse/workers/segments_worker.rb
 - lib/splitclient-rb/sse/workers/splits_worker.rb
 - lib/splitclient-rb/utilitites.rb

data/lib/splitclient-rb/sse/workers/control_worker.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module SplitIoClient
-  module SSE
-    module Workers
-      class ControlWorker
-        def initialize(config)
-          @config = config
-        end
-
-        def start
-          perform_thread
-          perform_passenger_forked if defined?(PhusionPassenger)
-        end
-
-        def stop
-          SplitIoClient::Helpers::ThreadHelper.stop(:control_worker, @config)
-        end
-
-        private
-
-        def perform
-          # TODO: IMPLEMENT THIS METHOD.
-        end
-
-        def perform_thread
-          @config.threads[:control_worker] = Thread.new do
-            @config.logger.debug('Starting control worker ...')
-            perform
-          end
-        end
-
-        def perform_passenger_forked
-          PhusionPassenger.on_event(:starting_worker_process) { |forked| perform_thread if forked }
-        end
-      end
-    end
-  end
-end