Skip to content

Allow the use of alternative net.Listener implementations by downstreams #25855

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.

Sign up for GitHub

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 7 commits into from
Jul 24, 2023
Merged

Allow the use of alternative net.Listener implementations by downstreams #25855

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da0ce85
allow the use of an alternate GetListener function, which can return …
eyedeekay May 30, 2023
2fcc4b7
Merge branch 'go-gitea:main' into pluggable-listeners
eyedeekay Jul 12, 2023
6431ca1
Add comments to explain how to use the GetListener variable, add a Ge…
Jul 13, 2023
6dcb29b
Move GetListener to server.go per @wxiaoguang's advice
Jul 17, 2023
f214b3d
Update modules/graceful/server.go
lunny Jul 24, 2023
e877743
Merge branch 'main' into pluggable-listeners
GiteaBot Jul 24, 2023
13f5d4f
Merge branch 'main' into pluggable-listeners
GiteaBot Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/graceful/net_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,13 @@ func CloseProvidedListeners() error {
return returnableError
}

var GetListener = DefaultGetListener
Copy link
Contributor

@wxiaoguang wxiaoguang Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It needs some comments about why it is done so here.

Otherwise it looks good to me.

Copy link
Contributor Author

@eyedeekay eyedeekay Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Primary reason for it being there is because that is where the GetListener function was before and I was trying to avoid moving anything or otherwise avoid making changes that would be cosmetic or unnecessary. Putting it there kept the whole set of changes to just the 2 lines and makes it very clear that all I did was make a function replaceable. I could move the GetListener variable declaration to the top of the file and it would have the same effect obviously, and if that's preferred I will.

Copy link
Contributor Author

@eyedeekay eyedeekay Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the GetListener to the top of the file with the other vars, commented both GetListener and DefaultGetListener to explain their usage, and added a GetListener/DefaultGetListener pair to net_windows.go


// GetListener obtains a listener for the local network address. The network must be
// a stream-oriented network: "tcp", "tcp4", "tcp6", "unix" or "unixpacket". It
// returns an provided net.Listener for the matching network and address, or
// creates a new one using net.Listen.
func GetListener(network, address string) (net.Listener, error) {
func DefaultGetListener(network, address string) (net.Listener, error) {
// Add a deferral to say that we've tried to grab a listener
defer GetManager().InformCleanup()
switch network {
Expand Down