Skip to content

Commit

Permalink
Remove unused error in graceful manager (#29871)
Browse files Browse the repository at this point in the history
As title.
  • Loading branch information
lng2020 authored Mar 18, 2024
1 parent 34290a0 commit 1f0d31c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
4 changes: 2 additions & 2 deletions modules/graceful/manager_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ func (g *Manager) start() {
go func() {
defer func() {
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
_ = CloseProvidedListeners()
// Close the unused listeners
closeProvidedListeners()
}()
// Wait for all servers to be created
g.createServerCond.L.Lock()
Expand Down
12 changes: 2 additions & 10 deletions modules/graceful/net_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,25 +129,17 @@ func getProvidedFDs() (savedErr error) {
return savedErr
}

// CloseProvidedListeners closes all unused provided listeners.
func CloseProvidedListeners() error {
// closeProvidedListeners closes all unused provided listeners.
func closeProvidedListeners() {
mutex.Lock()
defer mutex.Unlock()
var returnableError error
for _, l := range providedListeners {
err := l.Close()
if err != nil {
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{}

return returnableError
}

// DefaultGetListener obtains a listener for the stream-oriented local network address:
Expand Down

0 comments on commit 1f0d31c

Please sign in to comment.