Add connectTimeout to outgoing connections and fix handling of connec… #71
Conversation
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
ktoso
reviewed
Aug 30, 2019
| } | ||
|
|
||
| /// Time after which a connection attempt will fail if no connection could be established | ||
| public var connectTimeout: TimeAmount = .milliseconds(500) |
ktoso
approved these changes
Aug 30, 2019
Member
ktoso
left a comment
ktoso
left a comment
There was a problem hiding this comment.
So this is enough, at least right now?
Seems so but wanted to make sure before merging
| return context.awaitResult(of: outboundChanElf, timeout: .milliseconds(500)) { result in | ||
| // the timeout is being handled by the `connectTimeout` socket option | ||
| // in NIO, so it is safe to use an infinite timeout here | ||
| return context.awaitResult(of: outboundChanElf, timeout: .effectivelyInfinite) { result in |
Member
Author
|
@ktoso Yeah, I think that should be good for now. |
Member
|
Roger that 🖖 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…tion abortion #13
Modifications:
When connections failed we could end up with
.initiatedhandshakes that did not have a channel assigned, which in term caused an assertion to fail when that handshake was being replaced by another one. This PR changes the connection handling by adding a connect timeout, causing the channel to be closed if it does not establish a connection within the timeout and then remove the handshake from the_handshakesdict.Result: