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

cmd/containerboot: fix time based serveConfig watcher

Browse Source 
This broke in a last minute refactor and seems to have never worked.

Fixes #9686

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-10-11 14:24:05 -07:00 committed by Maisem Ali
parent 4abd470322
commit 2d4f808a4c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/containerboot/main.go
View File

@ -401,19 +401,20 @@ func watchServeConfigChanges(ctx context.Context, path string, cdChanged <-chan
panic("cd must not be nil") panic("cd must not be nil")
} }
var tickChan <-chan time.Time var tickChan <-chan time.Time
w, err := fsnotify.NewWatcher() var eventChan <-chan fsnotify.Event
if err != nil { if w, err := fsnotify.NewWatcher(); err != nil {
log.Printf("failed to create fsnotify watcher, timer-only mode: %v", err) log.Printf("failed to create fsnotify watcher, timer-only mode: %v", err)
ticker := time.NewTicker(5 * time.Second) ticker := time.NewTicker(5 * time.Second)
defer ticker.Stop() defer ticker.Stop()
tickChan = ticker.C tickChan = ticker.C
} else { } else {
defer w.Close() defer w.Close()
if err := w.Add(filepath.Dir(path)); err != nil {
log.Fatalf("failed to add fsnotify watch: %v", err)
}
eventChan = w.Events
} }
if err := w.Add(filepath.Dir(path)); err != nil {
log.Fatalf("failed to add fsnotify watch: %v", err)
}
var certDomain string var certDomain string
var prevServeConfig *ipn.ServeConfig var prevServeConfig *ipn.ServeConfig
for { for {
@ -423,7 +424,7 @@ func watchServeConfigChanges(ctx context.Context, path string, cdChanged <-chan
case <-cdChanged: case <-cdChanged:
certDomain = *certDomainAtomic.Load() certDomain = *certDomainAtomic.Load()
case <-tickChan: case <-tickChan:
case <-w.Events: case <-eventChan:
// We can't do any reasonable filtering on the event because of how // We can't do any reasonable filtering on the event because of how
// k8s handles these mounts. So just re-read the file and apply it // k8s handles these mounts. So just re-read the file and apply it
// if it's changed. // if it's changed.