Fix goroutine leak

cedws · cedws · commit 419638284953 · 2025-10-16T23:20:45.000+01:00
diff --git a/pkg/sshgate/sshgate.go b/pkg/sshgate/sshgate.go
@@ -233,10 +233,6 @@ func notifyConfigReload(ctx context.Context, config *Config) (context.Context, e
 	if err != nil {
 		return nil, err
 	}
-	go func() {
-		<-ctx.Done()
-		watcher.Close()
-	}()
 
 	if err := watcher.Add(config.path); err != nil {
 		return nil, err
@@ -254,7 +250,14 @@ func notifyConfigReload(ctx context.Context, config *Config) (context.Context, e
 		}
 	}
 
-	return fsnotifyContext(ctx, watcher), nil
+	ctx = fsnotifyContext(ctx, watcher)
+
+	go func() {
+		<-ctx.Done()
+		watcher.Close()
+	}()
+
+	return ctx, nil
 }
 
 func fsnotifyContext(ctx context.Context, watcher *fsnotify.Watcher) context.Context {

Original file line number	Diff line number	Diff line change
`@@ -233,10 +233,6 @@ func notifyConfigReload(ctx context.Context, config *Config) (context.Context, e`
`233`	`233`	`if err != nil {`
`234`	`234`	`return nil, err`
`235`	`235`	`}`
`236`		`- go func() {`
`237`		`- <-ctx.Done()`
`238`		`- watcher.Close()`
`239`		`- }()`
`240`	`236`
`241`	`237`	`if err := watcher.Add(config.path); err != nil {`
`242`	`238`	`return nil, err`
`@@ -254,7 +250,14 @@ func notifyConfigReload(ctx context.Context, config *Config) (context.Context, e`
`254`	`250`	`}`
`255`	`251`	`}`
`256`	`252`
`257`		`- return fsnotifyContext(ctx, watcher), nil`
	`253`	`+ ctx = fsnotifyContext(ctx, watcher)`
	`254`	`+`
	`255`	`+ go func() {`
	`256`	`+ <-ctx.Done()`
	`257`	`+ watcher.Close()`
	`258`	`+ }()`
	`259`	`+`
	`260`	`+ return ctx, nil`
`258`	`261`	`}`
`259`	`262`
`260`	`263`	`func fsnotifyContext(ctx context.Context, watcher *fsnotify.Watcher) context.Context {`