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
Fix netx.Conn metrics and reduce ndt7 websocket buffer #299
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f18bd34
Guarantee conn count is decremented once on close
stephen-soltesz 48d6ea1
Define smaller websocket buffer size
stephen-soltesz fb7f423
Be explicit in comment about buffer size
stephen-soltesz fc3d900
Merge branch 'master' into soltesz-fix-netx-dec
stephen-soltesz File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 |
---|---|---|
|
@@ -5,6 +5,7 @@ import ( | |
"log" | ||
"net" | ||
"os" | ||
"sync" | ||
"time" | ||
|
||
guuid "github.com/google/uuid" | ||
|
@@ -51,6 +52,7 @@ type Conn struct { | |
net.Conn | ||
fp *os.File | ||
netinfo iface.NetInfo | ||
once sync.Once | ||
} | ||
|
||
// Addr supports the net.Addr interface and allows mediated access to operations | ||
|
@@ -110,7 +112,7 @@ func (ln *Listener) Accept() (net.Conn, error) { | |
// returned by LocalAddr and RemoteAddr should be released before calling Close. | ||
func (mc *Conn) Close() error { | ||
mc.fp.Close() | ||
CurrentOpenConns.Dec() | ||
mc.once.Do(CurrentOpenConns.Dec) | ||
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. Thanks for this. |
||
return mc.Conn.Close() | ||
} | ||
|
||
|
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.
Would prefer a comment after this
// 1 MB
or maybe// 1 MiB
if you are feeling pedantic.