Skip to content

Commit b289f74

Browse files
chillaqchillaq
committed
fixed sync_manager errors
1 parent 55fa95e commit b289f74

5 files changed

Lines changed: 27 additions & 43 deletions

File tree

‎lib/splitclient-rb/cache/repositories/rule_based_segments_repository.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
require 'concurrent'
2-
require_relative '../../engine/models/sdk_internal_event_notification.rb'
3-
require_relative '../../engine/models/events_metadata.rb'
4-
require_relative '../../engine/models/sdk_internal_event.rb'
5-
require_relative '../../engine/models/sdk_event_type.rb'
62

73
module SplitIoClient
84
module Cache
@@ -54,10 +50,10 @@ def update(to_add, to_delete, new_change_number)
5450

5551
if to_add.length > 0 || to_delete.length > 0
5652
@internal_events_queue.push(
57-
SdkInternalEventNotification.new(
58-
SdkInternalEvent::RB_SEGMENTS_UPDATED,
59-
EventsMetadata.new(
60-
SdkEventType::SEGMENTS_UPDATE,
53+
SplitIoClient::Engine::Models::SdkInternalEventNotification.new(
54+
SplitIoClient::Engine::Models::SdkInternalEvent::RB_SEGMENTS_UPDATED,
55+
SplitIoClient::Engine::Models::EventsMetadata.new(
56+
SplitIoClient::Engine::Models::SdkEventType::SEGMENTS_UPDATE,
6157
[]
6258
)
6359
)

‎lib/splitclient-rb/cache/repositories/segments_repository.rb‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
require_relative '../../engine/models/sdk_internal_event_notification.rb'
2-
require_relative '../../engine/models/events_metadata.rb'
3-
require_relative '../../engine/models/sdk_internal_event.rb'
4-
require_relative '../../engine/models/sdk_event_type.rb'
5-
61
module SplitIoClient
72
module Cache
83
module Repositories
@@ -32,10 +27,10 @@ def add_to_segment(segment)
3227
remove_keys(name, segment[:removed])
3328
if segment[:added].length > 0 || segment[:removed].length > 0
3429
@internal_events_queue.push(
35-
SdkInternalEventNotification.new(
36-
SdkInternalEvent::SEGMENTS_UPDATED,
37-
EventsMetadata.new(
38-
SdkEventType::SEGMENTS_UPDATE,
30+
SplitIoClient::Engine::Models::SdkInternalEventNotification.new(
31+
SplitIoClient::Engine::Models::SdkInternalEvent::SEGMENTS_UPDATED,
32+
SplitIoClient::Engine::Models::EventsMetadata.new(
33+
SplitIoClient::Engine::Models::SdkEventType::SEGMENTS_UPDATE,
3934
[]
4035
)
4136
)

‎lib/splitclient-rb/cache/repositories/splits_repository.rb‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
require 'concurrent'
2-
require_relative '../../engine/models/sdk_internal_event_notification.rb'
3-
require_relative '../../engine/models/events_metadata.rb'
4-
require_relative '../../engine/models/sdk_internal_event.rb'
5-
require_relative '../../engine/models/sdk_event_type.rb'
62

73
module SplitIoClient
84
module Cache
@@ -61,10 +57,10 @@ def update(to_add, to_delete, new_change_number)
6157

6258
if to_add.length > 0 || to_delete.length > 0
6359
@internal_events_queue.push(
64-
SdkInternalEventNotification.new(
65-
SdkInternalEvent::FLAGS_UPDATED,
66-
EventsMetadata.new(
67-
SdkEventType::FLAG_UPDATE,
60+
SplitIoClient::Engine::Models::SdkInternalEventNotification.new(
61+
SplitIoClient::Engine::Models::SdkInternalEvent::FLAGS_UPDATED,
62+
SplitIoClient::Engine::Models::EventsMetadata.new(
63+
SplitIoClient::Engine::Models::SdkEventType::FLAG_UPDATE,
6864
to_add.map {|flag| flag[:name]} | to_delete.map {|flag| flag[:name]}
6965
)
7066
)
@@ -158,10 +154,10 @@ def kill(change_number, split_name, default_treatment)
158154

159155
@adapter.set_string(namespace_key(".split.#{split_name}"), split.to_json)
160156
@internal_events_queue.push(
161-
SdkInternalEventNotification.new(
162-
SdkInternalEvent::FLAG_KILLED_NOTIFICATION,
163-
EventsMetadata.new(
164-
SdkEventType::FLAG_UPDATE,
157+
SplitIoClient::Engine::Models::SdkInternalEventNotification.new(
158+
SplitIoClient::Engine::Models::SdkInternalEvent::FLAG_KILLED_NOTIFICATION,
159+
SplitIoClient::Engine::Models::EventsMetadata.new(
160+
SplitIoClient::Engine::Models::SdkEventType::FLAG_UPDATE,
165161
[split_name]
166162
)
167163
)

‎lib/splitclient-rb/engine/events/events_manager.rb‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# frozen_string_literal: true
2-
include SplitIoClient::Engine::Models
32

43
module SplitIoClient
54
module Engine
@@ -19,15 +18,15 @@ def register(sdk_event, event_handler)
1918

2019
@mutex.synchronize do
2120
# SDK ready already fired
22-
if sdk_event == SdkEvent::SDK_READY && event_already_triggered(sdk_event)
23-
@active_subscriptions[sdk_event] = EventActiveSubscriptions.new(true, event_handler)
21+
if sdk_event == SplitIoClient::Engine::Models::SdkEvent::SDK_READY && event_already_triggered(sdk_event)
22+
@active_subscriptions[sdk_event] = SplitIoClient::Engine::Models::EventActiveSubscriptions.new(true, event_handler)
2423
@config.logger.debug('EventsManager: Firing SDK_READY event for new subscription') if @config.debug_enabled
2524
fire_sdk_event(sdk_event, nil)
2625
return
2726
end
2827

2928
@config.logger.debug("EventsManager: Register event: #{sdk_event}") if @config.debug_enabled
30-
@active_subscriptions[sdk_event] = EventActiveSubscriptions.new(false, event_handler)
29+
@active_subscriptions[sdk_event] = SplitIoClient::Engine::Models::EventActiveSubscriptions.new(false, event_handler)
3130
end
3231
end
3332

@@ -51,7 +50,7 @@ def notify_internal_event(sdk_internal_event, event_metadata)
5150
# if client is not subscribed to SDK_READY
5251
if check_if_register_needed(sorted_event)
5352
@config.logger.debug('EventsManager: Registering SDK_READY event as fired') if @config.debug_enabled
54-
@active_subscriptions[SdkEvent::SDK_READY] = EventActiveSubscriptions.new(true, nil)
53+
@active_subscriptions[SplitIoClient::Engine::Models::SdkEvent::SDK_READY] = SplitIoClient::Engine::Models::EventActiveSubscriptions.new(true, nil)
5554
end
5655
end
5756
end
@@ -67,7 +66,7 @@ def destroy
6766
private
6867

6968
def check_if_register_needed(sorted_event)
70-
sorted_event == SdkEvent::SDK_READY &&
69+
sorted_event == SplitIoClient::Engine::Models::SdkEvent::SDK_READY &&
7170
get_event_handler(sorted_event).nil? &&
7271
!@active_subscriptions.include?(sorted_event)
7372
end
@@ -111,15 +110,15 @@ def get_event_handler(sdk_event)
111110
end
112111

113112
def get_sdk_event_if_applicable(sdk_internal_event)
114-
final_sdk_event = ValidSdkEvent.new(nil, false)
113+
final_sdk_event = SplitIoClient::Engine::Models::ValidSdkEvent.new(nil, false)
115114

116115
events_to_fire = []
117116
require_any_sdk_event = check_require_any(sdk_internal_event)
118117
if require_any_sdk_event.valid
119118
if (!event_already_triggered(require_any_sdk_event.sdk_event) &&
120119
execution_limit(require_any_sdk_event.sdk_event) == 1) ||
121120
execution_limit(require_any_sdk_event.sdk_event) == -1
122-
final_sdk_event = ValidSdkEvent.new(
121+
final_sdk_event = SplitIoClient::Engine::Models::ValidSdkEvent.new(
123122
require_any_sdk_event.sdk_event,
124123
check_prerequisites(require_any_sdk_event.sdk_event) &&
125124
check_suppressed_by(require_any_sdk_event.sdk_event)
@@ -179,10 +178,10 @@ def execution_limit(sdk_event)
179178
end
180179

181180
def check_require_any(sdk_internal_event)
182-
valid_sdk_event = ValidSdkEvent.new(nil, false)
181+
valid_sdk_event = SplitIoClient::Engine::Models::ValidSdkEvent.new(nil, false)
183182
@manager_config.require_any.each do |name, val|
184183
if val.include?(sdk_internal_event)
185-
valid_sdk_event = ValidSdkEvent.new(name, true)
184+
valid_sdk_event = SplitIoClient::Engine::Models::ValidSdkEvent.new(name, true)
186185
return valid_sdk_event
187186
end
188187
end

‎lib/splitclient-rb/engine/status_manager.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# frozen_string_literal: true
2-
require_relative './models/sdk_internal_event_notification.rb'
3-
require_relative './models/sdk_internal_event.rb'
42

53
module SplitIoClient
64
module Engine
@@ -23,8 +21,8 @@ def ready!
2321
@sdk_ready.count_down
2422
@config.logger.info('SplitIO SDK is ready')
2523
@internal_events_queue.push(
26-
SdkInternalEventNotification.new(
27-
SdkInternalEvent::SDK_READY, nil
24+
SplitIoClient::Engine::Models::SdkInternalEventNotification.new(
25+
SplitIoClient::Engine::Models::SdkInternalEvent::SDK_READY, nil
2826
)
2927
)
3028
end

0 commit comments

Comments
 (0)