wgengine: quiet some wireguard-go logging

The log lines that wireguard-go prints as it starts
and stops its worker routines are mostly noise.
They also happen after other work is completed,
which causes failures in some of the log testing packages.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
pull/1105/head
Josh Bleecher Snyder 4 years ago committed by Josh Bleecher Snyder
parent c580d2eab1
commit 1e4604f60e

@ -179,3 +179,16 @@ func (fn ArgWriter) Format(f fmt.State, _ rune) {
} }
var argBufioPool = &sync.Pool{New: func() interface{} { return bufio.NewWriterSize(ioutil.Discard, 1024) }} var argBufioPool = &sync.Pool{New: func() interface{} { return bufio.NewWriterSize(ioutil.Discard, 1024) }}
// Filtered returns a Logf that silently swallows some log lines.
// Each inbound format and args is evaluated and printed to a string s.
// The original format and args are passed to logf if and only if allow(s) returns true.
func Filtered(logf Logf, allow func(s string) bool) Logf {
return func(format string, args ...interface{}) {
msg := fmt.Sprintf(format, args...)
if !allow(msg) {
return
}
logf(format, args...)
}
}

@ -247,9 +247,15 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
} }
e.magicConn.SetNetworkUp(e.linkState.AnyInterfaceUp()) e.magicConn.SetNetworkUp(e.linkState.AnyInterfaceUp())
// wireguard-go logs as it starts and stops routines.
// Silence those; there are a lot of them, and they're just noise.
allowLogf := func(s string) bool {
return !strings.HasPrefix(s, "Routine:")
}
filtered := logger.Filtered(logf, allowLogf)
// flags==0 because logf is already nested in another logger. // flags==0 because logf is already nested in another logger.
// The outer one can display the preferred log prefixes, etc. // The outer one can display the preferred log prefixes, etc.
dlog := logger.StdLogger(logf) dlog := logger.StdLogger(filtered)
logger := device.Logger{ logger := device.Logger{
Debug: dlog, Debug: dlog,
Info: dlog, Info: dlog,

Loading…
Cancel
Save