Skip to content

Commit 24b0566

Browse files
committed
Minor changes in reconnection
Changed code as per the Rubocop generated suggestions
1 parent 5ba021d commit 24b0566

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Create instance of `Socket` class by passing url of socketcluster-server end-poi
9191
socket.connect
9292
```
9393

94-
- To disable Automatic Reconnection
94+
- To disable automatic reconnection to server
9595

9696
```ruby
9797
# This will disable reconnection to socketcluster-server

lib/socketclusterclient/reconnect.rb

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#
22
# Module Reconnect provides Reconnection Support
33
#
4-
# @author Piyush Wani <piyush.wani@amuratech.com>
4+
# @author Piyush Wani <piyushwww13@gmail.com>
55
#
66
module Reconnect
7-
87
#
98
# Initializes Reconnection related entities
109
#
@@ -13,7 +12,7 @@ module Reconnect
1312
#
1413
def initialize_reconnect
1514
@reconnect_interval = 2000
16-
@max_reconnect_interval = 30000
15+
@max_reconnect_interval = 30_000
1716
@reconnect_decay = 1
1817
@max_attempts = nil
1918
@attempts_made = 0
@@ -30,8 +29,8 @@ def initialize_reconnect
3029
#
3130
#
3231
def set_reconnection_listener(reconnect_interval, max_reconnect_interval, reconnect_decay, max_attempts)
32+
@reconnect_interval = (reconnect_interval > max_reconnect_interval) ? max_reconnect_interval : reconnect_interval
3333
@max_reconnect_interval = max_reconnect_interval
34-
@reconnect_interval = (@reconnect_interval > @max_reconnect_interval) ? @max_reconnect_interval : @reconnect_interval
3534
@reconnect_decay = reconnect_decay
3635
@max_attempts = max_attempts
3736
@attempts_made = 0
@@ -43,20 +42,20 @@ def set_reconnection_listener(reconnect_interval, max_reconnect_interval, reconn
4342
#
4443
#
4544
def reconnect
46-
if (@reconnect_interval < @max_reconnect_interval)
47-
@reconnect_interval = @reconnect_interval * @reconnect_decay
48-
@reconnect_interval = @max_reconnect_interval if (@reconnect_interval > @max_reconnect_interval)
45+
if @reconnect_interval < @max_reconnect_interval
46+
@reconnect_interval *= @reconnect_decay
47+
@reconnect_interval = @max_reconnect_interval if @reconnect_interval > @max_reconnect_interval
4948
end
5049

51-
until reconnection_attempts_finished do
50+
until reconnection_attempts_finished
5251
@attempts_made += 1
5352
@logger.warn("Attempt number : #{@attempts_made} ")
5453
connect
55-
sleep(@reconnect_interval/1000)
54+
sleep(@reconnect_interval / 1000)
5655
end
5756

5857
@attempts_made = 0
59-
@logger.warn("Unable to reconnect: max reconnection attempts reached")
58+
@logger.warn('Unable to reconnect: max reconnection attempts reached')
6059
end
6160

6261
private
@@ -68,7 +67,6 @@ def reconnect
6867
# @return [Boolean] Attempts finished
6968
#
7069
def reconnection_attempts_finished
71-
return @attempts_made == @max_attempts
70+
@attempts_made == @max_attempts
7271
end
73-
7472
end

0 commit comments

Comments
 (0)