TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

log/sockstatlog: make shutdown close idle connections

Browse Source 
Updates tailscale/corp#10030

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-03-23 18:54:22 -07:00 committed by Maisem Ali
parent 9e81db50f6
commit 4a89642f7f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
log/sockstatlog/logger.go
View File

@ -36,6 +36,8 @@ type Logger struct {
logf logger.Logf logf logger.Logf
logger *logtail.Logger logger *logtail.Logger
filch *filch.Filch
tr *http.Transport
} }
// deltaStat represents the bytes transferred during a time period. // deltaStat represents the bytes transferred during a time period.
@ -88,6 +90,8 @@ func NewLogger(logdir string, logf logger.Logf, logID logid.PublicID) (*Logger,
cancelFn: cancel, cancelFn: cancel,
ticker: time.NewTicker(pollPeriod), ticker: time.NewTicker(pollPeriod),
logf: logf, logf: logf,
filch: filch,
tr: logpolicy.NewLogtailTransport(logtail.DefaultHost),
} }
logger.logger = logtail.NewLogger(logtail.Config{ logger.logger = logtail.NewLogger(logtail.Config{
BaseURL: logpolicy.LogURL(), BaseURL: logpolicy.LogURL(),
@ -107,7 +111,7 @@ func NewLogger(logdir string, logf logger.Logf, logID logid.PublicID) (*Logger,
}, },
Stderr: io.Discard, // don't log to stderr Stderr: io.Discard, // don't log to stderr
HTTPC: &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost)}, HTTPC: &http.Client{Transport: logger.tr},
}, logf) }, logf)
go logger.poll() go logger.poll()
@ -166,8 +170,10 @@ func (l *Logger) Flush() {
func (l *Logger) Shutdown() { func (l *Logger) Shutdown() {
l.ticker.Stop() l.ticker.Stop()
l.logger.Shutdown(context.Background()) l.logger.Shutdown(l.ctx)
l.cancelFn() l.cancelFn()
l.filch.Close()
l.tr.CloseIdleConnections()
} }
// delta calculates the delta stats between two SockStats snapshots. // delta calculates the delta stats between two SockStats snapshots.