vikarti.anatra/opera-proxy
1
0
Fork 0
mirror of https://github.com/Snawoot/opera-proxy.git synced 2025-09-01 18:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

close resolvers properly

Browse source
This commit is contained in:
Vladislav Yarmak 2024-08-01 18:22:11 +03:00
parent 2e3cf20184
commit 58e16661fe
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -5,6 +5,7 @@ go 1.22.5
require (
github.com/AdguardTeam/dnsproxy v0.72.2
github.com/Snawoot/go-http-digest-auth-client v1.1.3
github.com/hashicorp/go-multierror v1.1.1
golang.org/x/net v0.27.0
)
@ -16,6 +17,7 @@ require (
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/miekg/dns v1.1.61 // indirect
github.com/onsi/ginkgo/v2 v2.19.1 // indirect
github.com/quic-go/qpack v0.4.0 // indirect

4
go.sum
View file

@ -22,6 +22,10 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=

4
main.go
View file

@ -210,6 +210,10 @@ func run() int {
addrs, err := func() ([]netip.Addr, error) {
ctx, cancel := context.WithTimeout(context.Background(), args.timeout)
defer cancel()
defer func() {
resolver = nil
}()
defer resolver.Close()
return resolver.LookupNetIP(ctx, "ip4", API_DOMAIN)
}()
if err != nil {

14
resolver.go
View file

@ -3,10 +3,12 @@ package main
import (
"context"
"fmt"
"io"
"net/netip"
"time"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/hashicorp/go-multierror"
)
type Resolver struct {
@ -36,3 +38,15 @@ func NewResolver(addresses []string, timeout time.Duration) (*Resolver, error) {
func (r *Resolver) LookupNetIP(ctx context.Context, network string, host string) (addrs []netip.Addr, err error) {
return r.resolvers.LookupNetIP(ctx, network, host)
}
func (r *Resolver) Close() error {
var res error
for _, resolver := range r.resolvers {
if closer, ok := resolver.(io.Closer); ok {
if err := closer.Close(); err != nil {
res = multierror.Append(res, err)
}
}
}
return res
}