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

Implement review suggestions

Browse Source
This commit is contained in:
Daniel
2021-09-27 12:52:36 +02:00
parent 7a04eea8e6
commit 48e9a35a07
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resolver/resolver-tcp.go
View File

@@ -118,7 +118,7 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
case <-time.After(heartbeatTimeout):
log.Warningf("resolver: heartbeat for dns client %s failed", tr.resolver.Info.DescriptiveName())
case <-ctx.Done():
return nil, ErrCancelled
return nil, ctx.Err()
case <-module.Stopping():
return nil, ErrShuttingDown
}
@@ -189,7 +189,7 @@ func (tr *TCPResolver) Query(ctx context.Context, q *Query) (*RRCache, error) {
select {
case resolverConn.queries <- tq:
case <-ctx.Done():
return nil, ErrCancelled
return nil, ctx.Err()
case <-module.Stopping():
return nil, ErrShuttingDown
case <-time.After(defaultRequestTimeout):
@@ -201,7 +201,7 @@ func (tr *TCPResolver) Query(ctx context.Context, q *Query) (*RRCache, error) {
select {
case reply = <-tq.Response:
case <-ctx.Done():
return nil, ErrCancelled
return nil, ctx.Err()
case <-module.Stopping():
return nil, ErrShuttingDown
case <-time.After(defaultRequestTimeout):