vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-16 17:59:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve logging

Browse source
This commit is contained in:
Daniel 2020-07-21 14:59:41 +02:00
parent dda7cdf7d0
commit 60607ef08b
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resolver/resolver-tcp.go
View file

@ -258,7 +258,7 @@ func (mgr *tcpResolverConnMgr) waitForWork(workerCtx context.Context) (proceed b
select { select {
case mgr.tr.queries <- inFlight.Msg: case mgr.tr.queries <- inFlight.Msg:
default: default:
log.Warningf("resolver: failed to re-inject abandoned query to %s", mgr.tr.resolver.Name) log.Warningf("resolver: failed to re-inject abandoned query to %s", mgr.tr.resolver.GetName())
} }
} }
// in-flight queries that match the connection instance ID are not changed. They are already in the queue. // in-flight queries that match the connection instance ID are not changed. They are already in the queue.
@ -276,7 +276,7 @@ func (mgr *tcpResolverConnMgr) waitForWork(workerCtx context.Context) (proceed b
select { select {
case mgr.tr.queries <- msg: case mgr.tr.queries <- msg:
case <-time.After(2 * time.Second): case <-time.After(2 * time.Second):
log.Warningf("resolver: failed to re-inject waking query to %s", mgr.tr.resolver.Name) log.Warningf("resolver: failed to re-inject waking query to %s", mgr.tr.resolver.GetName())
} }
return nil return nil
}) })
@ -302,13 +302,13 @@ func (mgr *tcpResolverConnMgr) establishConnection(workerCtx context.Context) (
var err error var err error
conn, err = mgr.tr.dnsClient.Dial(mgr.tr.resolver.ServerAddress) conn, err = mgr.tr.dnsClient.Dial(mgr.tr.resolver.ServerAddress)
if err != nil { if err != nil {
log.Debugf("resolver: failed to connect to %s (%s)", mgr.tr.resolver.Name, mgr.tr.resolver.ServerAddress) log.Debugf("resolver: failed to connect to %s (%s)", mgr.tr.resolver.GetName(), mgr.tr.resolver.ServerAddress)
return nil, nil, nil, nil return nil, nil, nil, nil
} }
connCtx, cancelConnCtx = context.WithCancel(workerCtx) connCtx, cancelConnCtx = context.WithCancel(workerCtx)
connClosing = abool.New() connClosing = abool.New()
log.Debugf("resolver: connected to %s (%s)", mgr.tr.resolver.Name, conn.RemoteAddr()) log.Debugf("resolver: connected to %s (%s)", mgr.tr.resolver.GetName(), conn.RemoteAddr())
// start reader // start reader
module.StartServiceWorker("dns client reader", 10*time.Millisecond, func(workerCtx context.Context) error { module.StartServiceWorker("dns client reader", 10*time.Millisecond, func(workerCtx context.Context) error {
@ -365,7 +365,7 @@ func (mgr *tcpResolverConnMgr) queryHandler( //nolint:golint // context.Context
err := conn.WriteMsg(msg) err := conn.WriteMsg(msg)
if err != nil { if err != nil {
if connClosing.SetToIf(false, true) { if connClosing.SetToIf(false, true) {
log.Warningf("resolver: write error to %s (%s): %s", mgr.tr.resolver.Name, conn.RemoteAddr(), err) log.Warningf("resolver: write error to %s (%s): %s", mgr.tr.resolver.GetName(), conn.RemoteAddr(), err)
} }
return true return true
} }
@ -381,7 +381,7 @@ func (mgr *tcpResolverConnMgr) queryHandler( //nolint:golint // context.Context
activeQueries := len(mgr.tr.inFlightQueries) activeQueries := len(mgr.tr.inFlightQueries)
mgr.tr.Unlock() mgr.tr.Unlock()
if activeQueries == 0 { if activeQueries == 0 {
log.Debugf("resolver: recycling conn to %s (%s)", mgr.tr.resolver.Name, conn.RemoteAddr()) log.Debugf("resolver: recycling conn to %s (%s)", mgr.tr.resolver.GetName(), conn.RemoteAddr())
return true return true
} }
} }
@ -402,7 +402,7 @@ func (mgr *tcpResolverConnMgr) handleQueryResponse(conn *dns.Conn, msg *dns.Msg)
if !ok { if !ok {
log.Debugf( log.Debugf(
"resolver: received possibly unsolicited reply from %s (%s): txid=%d q=%+v", "resolver: received possibly unsolicited reply from %s (%s): txid=%d q=%+v",
mgr.tr.resolver.Name, mgr.tr.resolver.GetName(),
conn.RemoteAddr(), conn.RemoteAddr(),
msg.Id, msg.Id,
msg.Question, msg.Question,
@ -448,7 +448,7 @@ func (mgr *tcpResolverConnMgr) msgReader(
msg, err := conn.ReadMsg() msg, err := conn.ReadMsg()
if err != nil { if err != nil {
if connClosing.SetToIf(false, true) { if connClosing.SetToIf(false, true) {
log.Warningf("resolver: read error from %s (%s): %s", mgr.tr.resolver.Name, conn.RemoteAddr(), err) log.Warningf("resolver: read error from %s (%s): %s", mgr.tr.resolver.GetName(), conn.RemoteAddr(), err)
} }
return nil return nil
} }