diff --git a/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb b/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb index 8c618e89..6fea7ef0 100644 --- a/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb +++ b/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb @@ -15,15 +15,10 @@ def initialize(segments_repository, api_key, config, telemetry_runtime_producer) def call if ENV['SPLITCLIENT_ENV'] == 'test' fetch_segments - else - segments_thread - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - segments_thread if forked - end - end + return end + + segments_thread end def fetch_segments_if_not_exists(names, cache_control_headers = false) diff --git a/lib/splitclient-rb/cache/fetchers/split_fetcher.rb b/lib/splitclient-rb/cache/fetchers/split_fetcher.rb index 92c33b4d..30d621c9 100644 --- a/lib/splitclient-rb/cache/fetchers/split_fetcher.rb +++ b/lib/splitclient-rb/cache/fetchers/split_fetcher.rb @@ -15,15 +15,10 @@ def initialize(splits_repository, api_key, config, telemetry_runtime_producer) def call if ENV['SPLITCLIENT_ENV'] == 'test' fetch_splits - else - splits_thread - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - splits_thread if forked - end - end + return end + + splits_thread end def fetch_splits(fetch_options = { cache_control_headers: false, till: nil }) diff --git a/lib/splitclient-rb/cache/senders/events_sender.rb b/lib/splitclient-rb/cache/senders/events_sender.rb index 0be80441..dcaf8371 100644 --- a/lib/splitclient-rb/cache/senders/events_sender.rb +++ b/lib/splitclient-rb/cache/senders/events_sender.rb @@ -11,12 +11,6 @@ def initialize(events_repository, config) def call events_thread - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - events_thread if forked - end - end end private diff --git a/lib/splitclient-rb/cache/senders/impressions_count_sender.rb b/lib/splitclient-rb/cache/senders/impressions_count_sender.rb index 9e94dff3..84d3d4f7 100644 --- a/lib/splitclient-rb/cache/senders/impressions_count_sender.rb +++ b/lib/splitclient-rb/cache/senders/impressions_count_sender.rb @@ -14,12 +14,6 @@ def initialize(config, impression_counter, impressions_api) def call impressions_count_thread - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - impressions_count_thread if forked - end - end end private diff --git a/lib/splitclient-rb/cache/senders/impressions_sender.rb b/lib/splitclient-rb/cache/senders/impressions_sender.rb index 1c8da739..1d223016 100644 --- a/lib/splitclient-rb/cache/senders/impressions_sender.rb +++ b/lib/splitclient-rb/cache/senders/impressions_sender.rb @@ -12,12 +12,6 @@ def initialize(impressions_repository, config, impressions_api) def call impressions_thread - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - impressions_thread if forked - end - end end private diff --git a/lib/splitclient-rb/engine/sync_manager.rb b/lib/splitclient-rb/engine/sync_manager.rb index e796f389..4b3b9f54 100644 --- a/lib/splitclient-rb/engine/sync_manager.rb +++ b/lib/splitclient-rb/engine/sync_manager.rb @@ -56,10 +56,6 @@ def start_thread if @config.streaming_enabled @config.logger.debug('Starting Straming mode ...') connected = @push_manager.start_sse - - if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) { |forked| sse_thread_forked if forked } - end end unless connected @@ -150,11 +146,6 @@ def process_disconnect(reconnect) def record_telemetry(type, data) @telemetry_runtime_producer.record_streaming_event(type, data) end - - def sse_thread_forked - connected = @push_manager.start_sse - @synchronizer.start_periodic_fetch unless connected - end end end end diff --git a/lib/splitclient-rb/sse/workers/segments_worker.rb b/lib/splitclient-rb/sse/workers/segments_worker.rb index 0a288ecc..afba6a85 100644 --- a/lib/splitclient-rb/sse/workers/segments_worker.rb +++ b/lib/splitclient-rb/sse/workers/segments_worker.rb @@ -61,10 +61,6 @@ def perform_thread perform end end - - def perform_passenger_forked - PhusionPassenger.on_event(:starting_worker_process) { |forked| perform_thread if forked } - end end end end diff --git a/lib/splitclient-rb/sse/workers/splits_worker.rb b/lib/splitclient-rb/sse/workers/splits_worker.rb index 03c780b1..bba572a5 100644 --- a/lib/splitclient-rb/sse/workers/splits_worker.rb +++ b/lib/splitclient-rb/sse/workers/splits_worker.rb @@ -70,10 +70,6 @@ def perform_thread perform end end - - def perform_passenger_forked - PhusionPassenger.on_event(:starting_worker_process) { |forked| perform_thread if forked } - end end end end diff --git a/lib/splitclient-rb/telemetry/sync_task.rb b/lib/splitclient-rb/telemetry/sync_task.rb index f8d394e5..af71e790 100644 --- a/lib/splitclient-rb/telemetry/sync_task.rb +++ b/lib/splitclient-rb/telemetry/sync_task.rb @@ -10,8 +10,6 @@ def initialize(config, telemetry_synchronizer) def call stats_thread - - PhusionPassenger.on_event(:starting_worker_process) { |forked| stats_thread if forked } if defined?(PhusionPassenger) end private diff --git a/lib/splitclient-rb/version.rb b/lib/splitclient-rb/version.rb index da1b73df..6e9e5832 100644 --- a/lib/splitclient-rb/version.rb +++ b/lib/splitclient-rb/version.rb @@ -1,3 +1,3 @@ module SplitIoClient - VERSION = '7.3.2' + VERSION = '7.3.3.pre.rc3' end diff --git a/splitclient-rb.gemspec b/splitclient-rb.gemspec index 1e10682a..abe707a2 100644 --- a/splitclient-rb.gemspec +++ b/splitclient-rb.gemspec @@ -51,11 +51,11 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'webmock' spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0' - spec.add_runtime_dependency 'faraday', '>= 0.8' + spec.add_runtime_dependency 'faraday', '~> 1.9.3' spec.add_runtime_dependency 'json', '>= 1.8' spec.add_runtime_dependency 'jwt', '>= 2.2.1' spec.add_runtime_dependency 'lru_redux' - spec.add_runtime_dependency 'net-http-persistent', '>= 2.9' + spec.add_runtime_dependency 'net-http-persistent', '~> 4.0.1' spec.add_runtime_dependency 'redis', '>= 4.2.2' spec.add_runtime_dependency 'socketry', '~> 0.5.1' spec.add_runtime_dependency 'thread_safe', '>= 0.3'