CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct debug logging in DNS-over-HTTP transport

Browse Source 
Logging there should use Log function to include the request ID if
present. Changes were made unintentionally during the refactoring to
eliminate usage of global logger.

This commits message restores the correct/old behavior.
This commit is contained in:
Cuong Manh Le
2025-07-07 17:36:25 +07:00
committed by Cuong Manh Le
parent 41282d0f51
commit 05d183c94b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.go
View File

@@ -552,7 +552,7 @@ func (uc *UpstreamConfig) newDOHTransport(ctx context.Context, addrs []string) *
if uc.BootstrapIP != "" {
dialer := net.Dialer{Timeout: dialerTimeout, KeepAlive: dialerTimeout}
addr := net.JoinHostPort(uc.BootstrapIP, port)
logger.Debug().Msgf("sending doh request to: %s", addr)
Log(ctx, logger.Debug(), "sending doh request to: %s", addr)
return dialer.DialContext(ctx, network, addr)
}
pd := &ctrldnet.ParallelDialer{}
@@ -566,7 +566,7 @@ func (uc *UpstreamConfig) newDOHTransport(ctx context.Context, addrs []string) *
if err != nil {
return nil, err
}
logger.Debug().Msgf("sending doh request to: %s", conn.RemoteAddr())
Log(ctx, logger.Debug(), "sending doh request to: %s", conn.RemoteAddr())
return conn, nil
}
runtime.SetFinalizer(transport, func(transport *http.Transport) {

4
config_quic.go
View File

@@ -42,7 +42,7 @@ func (uc *UpstreamConfig) newDOH3Transport(ctx context.Context, addrs []string)
// if we have a bootstrap ip set, use it to avoid DNS lookup
if uc.BootstrapIP != "" {
addr = net.JoinHostPort(uc.BootstrapIP, port)
logger.Debug().Msgf("sending doh3 request to: %s", addr)
Log(ctx, logger.Debug(), "sending doh3 request to: %s", addr)
udpConn, err := net.ListenUDP("udp", nil)
if err != nil {
return nil, err
@@ -62,7 +62,7 @@ func (uc *UpstreamConfig) newDOH3Transport(ctx context.Context, addrs []string)
if err != nil {
return nil, err
}
logger.Debug().Msgf("sending doh3 request to: %s", conn.RemoteAddr())
Log(ctx, logger.Debug(), "sending doh3 request to: %s", conn.RemoteAddr())
return conn, err
}
runtime.SetFinalizer(rt, func(rt *http3.Transport) {

2
doh.go
View File

@@ -165,7 +165,7 @@ func addHeader(ctx context.Context, req *http.Request, uc *UpstreamConfig) {
}
if printed {
logger := LoggerFromCtx(ctx)
logger.Debug().Msgf("sending request header: %v", dohHeader)
Log(ctx, logger.Debug(), "sending request header: %v", dohHeader)
}
dohHeader.Set("Content-Type", headerApplicationDNS)
dohHeader.Set("Accept", headerApplicationDNS)