From 90ead642b0bcbfccfaecf8030018cea8a5cf48a4 Mon Sep 17 00:00:00 2001
From: Andrew Ayer <andrew@sslmate.com>
Date: Wed, 21 May 2025 14:31:24 -0400
Subject: [PATCH] Simplify context cancellation checks

---
 monitor/daemon.go  |  4 ++--
 monitor/monitor.go | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/monitor/daemon.go b/monitor/daemon.go
index a2821ca..4dcd65d 100644
--- a/monitor/daemon.go
+++ b/monitor/daemon.go
@@ -137,9 +137,10 @@ func (daemon *daemon) run(ctx context.Context) error {
 	healthCheckTicker := time.NewTicker(daemon.config.HealthCheckInterval)
 	defer healthCheckTicker.Stop()
 
-	for ctx.Err() == nil {
+	for {
 		select {
 		case <-ctx.Done():
+			return ctx.Err()
 		case <-reloadLogListTicker.C:
 			if err := daemon.loadLogList(ctx); err != nil {
 				daemon.logListError = err.Error()
@@ -153,7 +154,6 @@ func (daemon *daemon) run(ctx context.Context) error {
 			}
 		}
 	}
-	return ctx.Err()
 }
 
 func Run(ctx context.Context, config *Config) error {
diff --git a/monitor/monitor.go b/monitor/monitor.go
index 3af2d8f..1e41eaa 100644
--- a/monitor/monitor.go
+++ b/monitor/monitor.go
@@ -444,11 +444,6 @@ func generateBatchesWorker(ctx context.Context, config *Config, ctlog *loglist.L
 
 func downloadWorker(ctx context.Context, config *Config, ctlog *loglist.Log, client ctclient.Log, batchesIn <-chan *batch, batchesOut chan<- *batch) error {
 	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
 		var batch *batch
 		select {
 		case <-ctx.Done():
@@ -462,11 +457,6 @@ func downloadWorker(ctx context.Context, config *Config, ctlog *loglist.Log, cli
 		}
 		batch.entries = entries
 
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
@@ -477,11 +467,6 @@ func downloadWorker(ctx context.Context, config *Config, ctlog *loglist.Log, cli
 
 func processWorker(ctx context.Context, config *Config, ctlog *loglist.Log, issuerGetter ctclient.IssuerGetter, batchesIn <-chan *batch, batchesOut *sequencer.Channel[batch]) error {
 	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
 		var batch *batch
 		select {
 		case <-ctx.Done():