replace reusePort by failOnExistingPort, simpler state (single bool), no TOCTOU for numThreads=1#53
Closed
timotheecour wants to merge 4 commits intodom96:masterfrom
Closed
Conversation
dom96
requested changes
Jul 15, 2021
Owner
dom96
left a comment
dom96
left a comment
There was a problem hiding this comment.
There is no need to worry about breaking changes for an unreleased piece of software, 0.4.0 was never tagged.
Please don't remove the existing reusePort. Just add the new failOnExisting flag. This PR shouldn't require more than 5 lines of changes.
I've added suggestions for exactly what I have in mind.
| # Package | ||
|
|
||
| version = "0.4.0" | ||
| version = "0.5.0" |
Owner
There was a problem hiding this comment.
Suggested change
| version = "0.5.0" | |
| version = "0.4.0" |
Comment on lines
+481
to
+484
| if settings.failOnExistingPort: | ||
| close(newSocketAux(settings)) # attempt to bind to a temporary socket | ||
| var settings = settings | ||
| settings.failOnExistingPort = false |
Owner
There was a problem hiding this comment.
Suggested change
| if settings.failOnExistingPort: | |
| close(newSocketAux(settings)) # attempt to bind to a temporary socket | |
| var settings = settings | |
| settings.failOnExistingPort = false | |
| if settings.failOnExistingPort: | |
| bindOnExistingTest(settings) |
Comment on lines
+315
to
+320
| proc newSocketAux(settings: Settings): owned(Socket) = | ||
| result = newSocket(settings.domain) | ||
| result.setSockOpt(OptReuseAddr, true) | ||
| result.setSockOpt(OptReusePort, not settings.failOnExistingPort) | ||
| result.bindAddr(settings.port, settings.bindAddr) | ||
|
|
Owner
There was a problem hiding this comment.
Suggested change
| proc newSocketAux(settings: Settings): owned(Socket) = | |
| result = newSocket(settings.domain) | |
| result.setSockOpt(OptReuseAddr, true) | |
| result.setSockOpt(OptReusePort, not settings.failOnExistingPort) | |
| result.bindAddr(settings.port, settings.bindAddr) | |
| proc bindOnExistingTest(settings: Settings) = | |
| let sock = newSocket(settings.domain) | |
| sock.setSockOpt(OptReuseAddr, true) | |
| sock.bindAddr(settings.port, settings.bindAddr) |
Comment on lines
-322
to
-327
| let server = newSocket(settings.domain) | ||
| server.setSockOpt(OptReuseAddr, true) | ||
| if compileOption("threads") and not settings.reusePort: | ||
| raise HttpBeastDefect(msg: "--threads:on requires reusePort to be enabled in settings") | ||
| server.setSockOpt(OptReusePort, settings.reusePort) | ||
| server.bindAddr(settings.port, settings.bindAddr) |
Owner
|
If you're still interested in pursuing this then please rebase and reopen this PR. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
should be followed by dom96/jester#281 in jester
alternative to #50 and #52 that hits all the targets:
jester.reusePortashttpbeast.failOnExistingPort=not reusePortfailOnExistingPortinside httpbeast, it's consistentThe only downside is that this is a breaking change from the previous commit for client code that would've used thew new reusePort flag, but it was introduced very recently (10 days ago), and wasn't the commit I had signed up for, refs #47 (comment)
so I've bumped the version to 0.5.0
(an alternative to this 10 day-window breaking change would be possible by adding a different
initSettings2and deprecatinginitSettings, or simply defineinitSettingsby interpreting the reusePort argument asnot failOnExistingPort; but this software is pre-1.0 and it's only a 10-day window so IMO is acceptable)