github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve resolver failing reporting

Browse Source
This commit is contained in:
Daniel
2021-11-17 14:10:11 +01:00
parent 113f37dcab
commit b94adf17c1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resolver/resolver-tcp.go
View File

@@ -145,10 +145,16 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
// Connect to server. // Connect to server.
conn, err := tr.dnsClient.Dial(tr.resolver.ServerAddress) conn, err := tr.dnsClient.Dial(tr.resolver.ServerAddress)
if err != nil { if err != nil {
log.Debugf("resolver: failed to connect to %s", tr.resolver.Info.DescriptiveName()) // Hint network environment at failed connection.
netenv.ReportFailedConnection()
log.Debugf("resolver: failed to connect to %s: %s", tr.resolver.Info.DescriptiveName(), err)
return nil, fmt.Errorf("%w: failed to connect to %s: %s", ErrFailure, tr.resolver.Info.DescriptiveName(), err) return nil, fmt.Errorf("%w: failed to connect to %s: %s", ErrFailure, tr.resolver.Info.DescriptiveName(), err)
} }
// Hint network environment at successful connection.
netenv.ReportSuccessfulConnection()
// Log that a connection to the resolver was established. // Log that a connection to the resolver was established.
log.Debugf( log.Debugf(
"resolver: connected to %s", "resolver: connected to %s",
@@ -174,9 +180,6 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
// Set resolver conn for reuse. // Set resolver conn for reuse.
tr.resolverConn = resolverConn tr.resolverConn = resolverConn
// Hint network environment at successful connection.
netenv.ReportSuccessfulConnection()
return resolverConn, nil return resolverConn, nil
} }