forks/forgejo
1
0
Fork 0
Code Releases Activity

Remove unused error in graceful manager (#29871)

Browse source 
As title.

(cherry picked from commit 1f0d31ce8fdfc8c32f84e4e0801c2d04b727bbd8)
This commit is contained in:
Nanguan Lin 2024-03-19 05:14:51 +08:00 committed by Earl Warren
parent 4711d3311b
commit 40c9fa43cd
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/graceful/manager_unix.go
View file

@ -59,8 +59,8 @@ func (g *Manager) start() {
go func() { go func() {
defer func() { defer func() {
close(startupDone) close(startupDone)
// Close the unused listeners and ignore the error here there's not much we can do with it, they're logged in the CloseProvidedListeners function // Close the unused listeners
_ = CloseProvidedListeners() closeProvidedListeners()
}() }()
// Wait for all servers to be created // Wait for all servers to be created
g.createServerCond.L.Lock() g.createServerCond.L.Lock()

12
modules/graceful/net_unix.go
View file

@ -129,25 +129,17 @@ func getProvidedFDs() (savedErr error) {
return savedErr return savedErr
} }
// CloseProvidedListeners closes all unused provided listeners. // closeProvidedListeners closes all unused provided listeners.
func CloseProvidedListeners() error { func closeProvidedListeners() {
mutex.Lock() mutex.Lock()
defer mutex.Unlock() defer mutex.Unlock()
var returnableError error
for _, l := range providedListeners { for _, l := range providedListeners {
err := l.Close() err := l.Close()
if err != nil { if err != nil {
log.Error("Error in closing unused provided listener: %v", err) log.Error("Error in closing unused provided listener: %v", err)
if returnableError != nil {
returnableError = fmt.Errorf("%v & %w", returnableError, err)
} else {
returnableError = err
}
} }
} }
providedListeners = []net.Listener{} providedListeners = []net.Listener{}
return returnableError
} }
// DefaultGetListener obtains a listener for the stream-oriented local network address: // DefaultGetListener obtains a listener for the stream-oriented local network address: