mirror of
https://github.com/qdm12/gluetun.git
synced 2026-06-25 13:27:31 +02:00
Fix ordering in cleanup function
This commit is contained in:
@@ -45,16 +45,16 @@ func (c *Client) OpenHTTPS(ctx context.Context, destinationTLSName string, desti
|
|||||||
cleanup = func() error {
|
cleanup = func() error {
|
||||||
var errs []error
|
var errs []error
|
||||||
httpClient.CloseIdleConnections()
|
httpClient.CloseIdleConnections()
|
||||||
|
err = connection.Close()
|
||||||
|
if err != nil && !errors.Is(err, net.ErrClosed) {
|
||||||
|
errs = append(errs, fmt.Errorf("closing connection: %w", err))
|
||||||
|
}
|
||||||
const remove = true
|
const remove = true
|
||||||
err := c.firewall.AcceptOutputFromIPPortToIPPort(context.Background(), "tcp", c.outboundInterface,
|
err := c.firewall.AcceptOutputFromIPPortToIPPort(context.Background(), "tcp", c.outboundInterface,
|
||||||
sourceAddrPort, destinationAddrPort, remove)
|
sourceAddrPort, destinationAddrPort, remove)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errs = append(errs, fmt.Errorf("removing output traffic rule: %w", err))
|
errs = append(errs, fmt.Errorf("removing output traffic rule: %w", err))
|
||||||
}
|
}
|
||||||
err = connection.Close()
|
|
||||||
if err != nil && !errors.Is(err, net.ErrClosed) {
|
|
||||||
errs = append(errs, fmt.Errorf("closing connection: %w", err))
|
|
||||||
}
|
|
||||||
if len(errs) > 0 {
|
if len(errs) > 0 {
|
||||||
return errors.Join(errs...)
|
return errors.Join(errs...)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user