File tree 2 files changed +4
-12
lines changed
2 files changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -59,8 +59,8 @@ func (g *Manager) start() {
59
59
go func () {
60
60
defer func () {
61
61
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 ()
64
64
}()
65
65
// Wait for all servers to be created
66
66
g .createServerCond .L .Lock ()
Original file line number Diff line number Diff line change @@ -129,25 +129,17 @@ func getProvidedFDs() (savedErr error) {
129
129
return savedErr
130
130
}
131
131
132
- // CloseProvidedListeners closes all unused provided listeners.
133
- func CloseProvidedListeners () error {
132
+ // closeProvidedListeners closes all unused provided listeners.
133
+ func closeProvidedListeners () {
134
134
mutex .Lock ()
135
135
defer mutex .Unlock ()
136
- var returnableError error
137
136
for _ , l := range providedListeners {
138
137
err := l .Close ()
139
138
if err != nil {
140
139
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
- }
146
140
}
147
141
}
148
142
providedListeners = []net.Listener {}
149
-
150
- return returnableError
151
143
}
152
144
153
145
// DefaultGetListener obtains a listener for the stream-oriented local network address:
You can’t perform that action at this time.
0 commit comments