Skip to content

Commit 6e2d9b5

Browse files
authored
Merge pull request #28 from ciesielskilucas/reversion_error
Reversion error
2 parents 0ddc2d0 + c6942c7 commit 6e2d9b5

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Diff for: lib/deepstream/client.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ def initialize(url, options = {})
3434
@challenge_denied, @@deliberate_close = false
3535
@state = CONNECTION_STATE::CLOSED
3636
@verbose = @options[:verbose]
37+
@reinitialize_master = @options[:reinitialize_master]
3738
@log = Async.logger
38-
@never_connected_before = true
39+
@connected_before = false
3940
connect
4041
end
4142

@@ -156,7 +157,7 @@ def on_challenge
156157
def on_connection_ack
157158
@state = CONNECTION_STATE::AUTHENTICATING
158159
@message_buffer.delete_if { |msg| msg.action == ACTION::PATCH }
159-
@record_handler.reinitialize unless @never_connected_before
160+
@record_handler.reinitialize if @connected_before
160161
login
161162
end
162163

@@ -166,7 +167,7 @@ def on_ping
166167
end
167168

168169
def on_login
169-
@never_connected_before = false
170+
@connected_before = true
170171
@state = CONNECTION_STATE::OPEN
171172
every(@options[:heartbeat_interval]) { check_heartbeat } if @options[:heartbeat_interval]
172173
resubscribe

Diff for: lib/deepstream/helpers.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def self.default_options
3838
heartbeat_interval: nil,
3939
in_thread: true,
4040
verbose: false,
41-
debug: false
41+
debug: false,
42+
reinitialize_master: false
4243
}
4344
end
4445

Diff for: lib/deepstream/record.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def start_reinitializing
4040
end
4141

4242
def end_reinitializing
43-
reset_version
44-
set(@data_cache)
43+
reset_version if @client.options[:reinitialize_master]
44+
set(@data_cache) if @client.options[:reinitialize_master]
4545
@is_reinitializing = false
4646
end
4747

0 commit comments

Comments
 (0)