TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-11 13:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

log/sockstatlog: don't block for more than 5s on shutdown

Browse Source 
Fixes tailscale/corp#21618

Signed-off-by: Anton Tolchanov <anton@tailscale.com>
This commit is contained in:
Anton Tolchanov
2024-07-12 17:27:10 +01:00
committed by Anton Tolchanov
parent 9609b26541
commit 5d61d1c7b0
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipn/ipnlocal/local.go
View File

@@ -730,7 +730,9 @@ func (b *LocalBackend) Shutdown() {
b.webClientShutdown()
if b.sockstatLogger != nil {
b.sockstatLogger.Shutdown()
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
b.sockstatLogger.Shutdown(ctx)
}
if b.peerAPIServer != nil {
b.peerAPIServer.taildrop.Shutdown()