Use context.WIthoutCancel when releasing locks

mholt · mholt · commit 23f868079ee6 · 2024-03-05T14:41:45.000-07:00
Fulfills a TODO. Makes it so locks can be released when shutting down/reloading.
diff --git a/storage.go b/storage.go
@@ -289,7 +289,7 @@ func acquireLock(ctx context.Context, storage Storage, lockKey string) error {
 }
 
 func releaseLock(ctx context.Context, storage Storage, lockKey string) error {
-	err := storage.Unlock(context.TODO(), lockKey) // TODO: in Go 1.21, use WithoutCancel (see #247)
+	err := storage.Unlock(context.WithoutCancel(ctx), lockKey)
 	if err == nil {
 		locksMu.Lock()
 		delete(locks, lockKey)

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func acquireLock(ctx context.Context, storage Storage, lockKey string) error {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`func releaseLock(ctx context.Context, storage Storage, lockKey string) error {`
`292`		`- err := storage.Unlock(context.TODO(), lockKey) // TODO: in Go 1.21, use WithoutCancel (see #247)`
	`292`	`+ err := storage.Unlock(context.WithoutCancel(ctx), lockKey)`
`293`	`293`	`if err == nil {`
`294`	`294`	`locksMu.Lock()`
`295`	`295`	`delete(locks, lockKey)`