Bumped linter and fixed a potential race condition

mhutchinson · mhutchinson · commit 3ae8c0864638 · 2026-01-20T17:00:46.000Z
The linter found this, which is neat. Don't increment your wait group counters inside go functions, kids.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,5 +19,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
-          version: v2.1.6
+          version: v2.6.0
           args: --timeout=5m
diff --git a/trillian/ctfe/ct_server/main.go b/trillian/ctfe/ct_server/main.go
@@ -346,8 +346,8 @@ func main() {
 	}
 
 	shutdownWG := new(sync.WaitGroup)
+	shutdownWG.Add(1)
 	go awaitSignal(func() {
-		shutdownWG.Add(1)
 		defer shutdownWG.Done()
 		// Allow 60s for any pending requests to finish then terminate any stragglers
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*60)

Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,8 @@ func main() {`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`shutdownWG := new(sync.WaitGroup)`
	`349`	`+ shutdownWG.Add(1)`
`349`	`350`	`go awaitSignal(func() {`
`350`		`- shutdownWG.Add(1)`
`351`	`351`	`defer shutdownWG.Done()`
`352`	`352`	`// Allow 60s for any pending requests to finish then terminate any stragglers`
`353`	`353`	`ctx, cancel := context.WithTimeout(context.Background(), time.Second*60)`