wgengine/router: don't double-prefix dns log messages [Windows]

(cherry picked from commit 119101962c)
pull/912/head
Brad Fitzpatrick 5 years ago
parent c1bae7ad64
commit d5bc375b0e

@ -63,7 +63,8 @@ func (lhs Config) Equal(rhs Config) bool {
// ManagerConfig is the set of parameters from which // ManagerConfig is the set of parameters from which
// a manager implementation is chosen and initialized. // a manager implementation is chosen and initialized.
type ManagerConfig struct { type ManagerConfig struct {
// logf is the logger for the manager to use. // Logf is the logger for the manager to use.
// It is wrapped with a "dns: " prefix.
Logf logger.Logf Logf logger.Logf
// InterfaceNAme is the name of the interface with which DNS settings should be associated. // InterfaceNAme is the name of the interface with which DNS settings should be associated.
InterfaceName string InterfaceName string

@ -39,7 +39,7 @@ func newUserspaceRouter(logf logger.Logf, wgdev *device.Device, tundev tun.Devic
nativeTun := tundev.(*tun.NativeTun) nativeTun := tundev.(*tun.NativeTun)
guid := nativeTun.GUID().String() guid := nativeTun.GUID().String()
mconfig := dns.ManagerConfig{ mconfig := dns.ManagerConfig{
Logf: logger.WithPrefix(logf, "dns: "), Logf: logf,
InterfaceName: guid, InterfaceName: guid,
} }

Loading…
Cancel
Save