fix incorrect usage of timer.Timer

Calling `timer.Stop` in a timer that already fired results in `Stop` returning false and subsequent drain will block because the channel isn't closed. This PR fixes the drain behaviour by wrapping the drain operation in a non-blocking select.
gravitational · Aug 26, 2024 · b35843f · b35843f
1 parent 50d50ed
commit b35843f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/secretsscanner/authorizedkeys/authorized_keys.go b/lib/secretsscanner/authorizedkeys/authorized_keys.go
@@ -210,7 +210,10 @@ func (w *Watcher) start(ctx context.Context) error {
 		}
 
 		if !timer.Stop() {
-			<-timer.Chan()
+			select {
+			case <-timer.Chan():
+			default:
+			}
 		}
 		timer.Reset(jitterFunc(maxReSendInterval))
 

diff --git a/mm/main.go b/mm/main.go
@@ -0,0 +1 @@
+package mm