-
Notifications
You must be signed in to change notification settings - Fork 2
Reconnection support #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| require 'websocket-eventmachine-client' | ||
| require 'json' | ||
| require 'logger' | ||
|
|
||
| require_relative './socketclusterclient/emitter' | ||
| require_relative './socketclusterclient/parser' | ||
| require_relative './socketclusterclient/data_models' | ||
| require_relative './socketclusterclient/reconnect' | ||
|
|
||
| # | ||
| # Class ScClient provides an interface to connect to the socketcluster server | ||
|
|
@@ -13,6 +15,9 @@ | |
| class ScClient | ||
| include Emitter | ||
| include DataModels | ||
| include Reconnect | ||
|
|
||
| attr_accessor :reconnect_interval, :max_reconnect_interval, :reconnect_decay, :max_attempts, :attempts_made | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't need to add attr_accessor for variables used in the class itself and unless we are using strong params.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
|
||
| # | ||
| # Initializes instance variables in socketcluster client | ||
|
|
@@ -28,6 +33,9 @@ def initialize(url) | |
| @enable_reconnection = true | ||
| @delay = 3 | ||
| initialize_emitter | ||
| initialize_reconnect | ||
| @logger = Logger.new(STDOUT) | ||
| @logger.level = Logger::WARN | ||
| end | ||
|
|
||
| # | ||
|
|
@@ -340,15 +348,4 @@ def reset_value | |
| def increment_cnt | ||
| @cnt += 1 | ||
| end | ||
|
|
||
| # | ||
| # Reconnects to ScServer after delay | ||
| # | ||
| # | ||
| # | ||
| # | ||
| def reconnect | ||
| sleep @delay | ||
| connect | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # | ||
| # Module Reconnect provides Reconnection Support | ||
| # | ||
| # @author Piyush Wani <piyushwww13@gmail.com> | ||
| # | ||
| module Reconnect | ||
| # | ||
| # Initializes Reconnection related entities | ||
| # | ||
| # | ||
| # | ||
| # | ||
| def initialize_reconnect | ||
| @reconnect_interval = 2000 | ||
| @max_reconnect_interval = 30_000 | ||
| @reconnect_decay = 1 | ||
| @max_attempts = nil | ||
| @attempts_made = 0 | ||
| end | ||
|
|
||
| # | ||
| # Adds handler for Reconnection | ||
| # | ||
| # @param [Integer] reconnect_interval A interval for reconnection attempt( in MiliSeconds ) | ||
| # @param [Integer] max_reconnect_interval The Max Limit for reconnection interval (in MiliSeconds) | ||
| # @param [Integer] reconnect_decay A | ||
| # @param [Integer] max_attempts The Maximum number of Reconnection Attempts Allowed | ||
| # | ||
| # | ||
| # | ||
| def set_reconnection_listener(reconnect_interval, max_reconnect_interval, reconnect_decay, max_attempts) | ||
| @reconnect_interval = (reconnect_interval > max_reconnect_interval) ? max_reconnect_interval : reconnect_interval | ||
| @max_reconnect_interval = max_reconnect_interval | ||
| @reconnect_decay = reconnect_decay | ||
| @max_attempts = max_attempts | ||
| @attempts_made = 0 | ||
| end | ||
|
|
||
| # | ||
| # Reconnects to ScServer after delay | ||
| # | ||
| # | ||
| # | ||
| def reconnect | ||
| if @reconnect_interval < @max_reconnect_interval | ||
| @reconnect_interval *= @reconnect_decay | ||
| @reconnect_interval = @max_reconnect_interval if @reconnect_interval > @max_reconnect_interval | ||
| end | ||
|
|
||
| until reconnection_attempts_finished | ||
| @attempts_made += 1 | ||
| @logger.warn("Attempt number : #{@attempts_made} ") | ||
| connect | ||
| sleep(@reconnect_interval / 1000) | ||
| end | ||
|
|
||
| @attempts_made = 0 | ||
| @logger.warn('Unable to reconnect: max reconnection attempts reached') | ||
| end | ||
|
|
||
| private | ||
|
|
||
| # | ||
| # Checks whether all attempts are finished or not | ||
| # | ||
| # | ||
| # @return [Boolean] Attempts finished | ||
| # | ||
| def reconnection_attempts_finished | ||
| @attempts_made == @max_attempts | ||
| end | ||
| end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we also add an example, if we set_reconnection to true?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
set_reconnction method is for automatic reconnection and one should not manually reconnect if auto_reconnection is enabled. so no need to add an example for that