TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: close test loggers once we're done with them

Browse Source 
This is a big hammer approach to helping with #1132.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-01-14 17:39:36 -08:00 committed by Josh Bleecher Snyder
parent 08baa17d9a
commit 2d837f79dc
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
types/logger/logger.go
View File

@ -192,3 +192,27 @@ func Filtered(logf Logf, allow func(s string) bool) Logf {
logf(format, args...) logf(format, args...)
} }
} }
// LogfCloser wraps logf to create a logger that can be closed.
// Calling close makes all future calls to newLogf into no-ops.
func LogfCloser(logf Logf) (newLogf Logf, close func()) {
var (
mu sync.Mutex
closed bool
)
close = func() {
mu.Lock()
defer mu.Unlock()
closed = true
}
newLogf = func(msg string, args ...interface{}) {
mu.Lock()
if closed {
mu.Unlock()
return
}
mu.Unlock()
logf(msg, args...)
}
return newLogf, close
}

22
wgengine/magicsock/magicsock_test.go
View File

@ -567,9 +567,12 @@ func TestConnClosing(t *testing.T) {
t.Fatalf("generating private key: %v", err) t.Fatalf("generating private key: %v", err)
} }
logf, closeLogf := logger.LogfCloser(t.Logf)
defer closeLogf()
epCh := make(chan []string, 100) epCh := make(chan []string, 100)
conn, err := NewConn(Options{ conn, err := NewConn(Options{
Logf: t.Logf, Logf: logf,
PacketListener: nettype.Std{}, PacketListener: nettype.Std{},
EndpointsFunc: func(eps []string) { EndpointsFunc: func(eps []string) {
epCh <- eps epCh <- eps
@ -580,7 +583,7 @@ func TestConnClosing(t *testing.T) {
t.Fatalf("constructing magicsock: %v", err) t.Fatalf("constructing magicsock: %v", err)
} }
derpMap, cleanup := runDERPAndStun(t, t.Logf, nettype.Std{}, netaddr.IPv4(127, 0, 3, 1)) derpMap, cleanup := runDERPAndStun(t, logf, nettype.Std{}, netaddr.IPv4(127, 0, 3, 1))
defer cleanup() defer cleanup()
// The point of this test case is to exercise handling in derpWriteChanOfAddr() which // The point of this test case is to exercise handling in derpWriteChanOfAddr() which
@ -597,11 +600,11 @@ func TestConnClosing(t *testing.T) {
} }
tun := tuntest.NewChannelTUN() tun := tuntest.NewChannelTUN()
tsTun := tstun.WrapTUN(t.Logf, tun.TUN()) tsTun := tstun.WrapTUN(logf, tun.TUN())
tsTun.SetFilter(filter.NewAllowAllForTest(t.Logf)) tsTun.SetFilter(filter.NewAllowAllForTest(logf))
dev := device.NewDevice(tsTun, &device.DeviceOptions{ dev := device.NewDevice(tsTun, &device.DeviceOptions{
Logger: wireguardGoLogger(t.Logf), Logger: wireguardGoLogger(logf),
CreateEndpoint: conn.CreateEndpoint, CreateEndpoint: conn.CreateEndpoint,
CreateBind: conn.CreateBind, CreateBind: conn.CreateBind,
SkipBindUpdate: true, SkipBindUpdate: true,
@ -634,12 +637,15 @@ func TestConnClosed(t *testing.T) {
stunIP: sif.V4(), stunIP: sif.V4(),
} }
derpMap, cleanup := runDERPAndStun(t, t.Logf, d.stun, d.stunIP) logf, closeLogf := logger.LogfCloser(t.Logf)
defer closeLogf()
derpMap, cleanup := runDERPAndStun(t, logf, d.stun, d.stunIP)
defer cleanup() defer cleanup()
ms1 := newMagicStack(t, logger.WithPrefix(t.Logf, "conn1: "), d.m1, derpMap) ms1 := newMagicStack(t, logger.WithPrefix(logf, "conn1: "), d.m1, derpMap)
defer ms1.Close() defer ms1.Close()
ms2 := newMagicStack(t, logger.WithPrefix(t.Logf, "conn2: "), d.m2, derpMap) ms2 := newMagicStack(t, logger.WithPrefix(logf, "conn2: "), d.m2, derpMap)
defer ms2.Close() defer ms2.Close()
cleanup = meshStacks(t.Logf, []*magicStack{ms1, ms2}) cleanup = meshStacks(t.Logf, []*magicStack{ms1, ms2})