Skip to content

Commit 1f0d31c

Browse files
authored
Remove unused error in graceful manager (#29871)
As title.
1 parent 34290a0 commit 1f0d31c

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

modules/graceful/manager_unix.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func (g *Manager) start() {
5959
go func() {
6060
defer func() {
6161
close(startupDone)
62-
// 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
63-
_ = CloseProvidedListeners()
62+
// Close the unused listeners
63+
closeProvidedListeners()
6464
}()
6565
// Wait for all servers to be created
6666
g.createServerCond.L.Lock()

modules/graceful/net_unix.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,17 @@ func getProvidedFDs() (savedErr error) {
129129
return savedErr
130130
}
131131

132-
// CloseProvidedListeners closes all unused provided listeners.
133-
func CloseProvidedListeners() error {
132+
// closeProvidedListeners closes all unused provided listeners.
133+
func closeProvidedListeners() {
134134
mutex.Lock()
135135
defer mutex.Unlock()
136-
var returnableError error
137136
for _, l := range providedListeners {
138137
err := l.Close()
139138
if err != nil {
140139
log.Error("Error in closing unused provided listener: %v", err)
141-
if returnableError != nil {
142-
returnableError = fmt.Errorf("%v & %w", returnableError, err)
143-
} else {
144-
returnableError = err
145-
}
146140
}
147141
}
148142
providedListeners = []net.Listener{}
149-
150-
return returnableError
151143
}
152144

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

0 commit comments

Comments
 (0)