From 005b3353714a4e861e8926810c6ad002790088e0 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Fri, 9 Oct 2026 18:26:10 +0100
Subject: [PATCH] Minor fixes: - Fixed function name typo - Fetcher/Run now
 returns a combination of errors if any workers error out. All other workers
 are ordered to shutdown if any one does error out - findATender now returns a
 pointer instead of an instance from New

---
 cmd/jobsearch/main.go               |  2 +-
 internal/cli/fetch/service.go       |  4 +---
 internal/cli/logging.go             |  2 +-
 internal/fetcher/fetcher.go         | 23 ++++++++++++++++++++---
 internal/findATender/api.go         | 11 ++++++-----
 internal/findATender/findATender.go |  4 ++--
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/cmd/jobsearch/main.go b/cmd/jobsearch/main.go
index 17b4da9..ad55cd7 100644
--- a/cmd/jobsearch/main.go
+++ b/cmd/jobsearch/main.go
@@ -47,7 +47,7 @@ opportunities.
 			HiddenDefaultCmd: true,
 		},
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			cli.SetupIntialLogging(cmd)
+			cli.SetupInitialLogging(cmd)
 
 			slog.Debug("root.PersistentPreRun")
 			slog.Debug(
diff --git a/internal/cli/fetch/service.go b/internal/cli/fetch/service.go
index 02ead3d..07a50a5 100644
--- a/internal/cli/fetch/service.go
+++ b/internal/cli/fetch/service.go
@@ -52,9 +52,7 @@ func commandService(opts *cli.Options) *cobra.Command {
 				stop()
 			}()
 
-			fetcher.Run(ctx, conf, since)
-
-			return nil
+			return fetcher.Run(ctx, conf, since)
 		},
 	}
 	cmd.Flags().Time(
diff --git a/internal/cli/logging.go b/internal/cli/logging.go
index 8ea2a5d..b66c500 100644
--- a/internal/cli/logging.go
+++ b/internal/cli/logging.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func SetupIntialLogging(cmd *cobra.Command) {
+func SetupInitialLogging(cmd *cobra.Command) {
 	// Start logging to terminal first - any commands that want to use file
 	// logging should activate it themselves
 	logging.LogToTerminal()
diff --git a/internal/fetcher/fetcher.go b/internal/fetcher/fetcher.go
index bfe64fa..7141dc8 100644
--- a/internal/fetcher/fetcher.go
+++ b/internal/fetcher/fetcher.go
@@ -2,6 +2,7 @@ package fetcher
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"sync"
@@ -13,10 +14,21 @@ import (
 
 var ErrNoNewReleases = fmt.Errorf("%w: no new releases", util.ErrWorkerNoWork)
 
+// Run starts a worker for each enabled source and blocks until every worker
+// has stopped. Workers stop when ctx is cancelled, or when any worker stops
+// with an error, which starts a shutdown of all of them. The errors are
+// logged as they happen and returned joined; nil means a clean shutdown.
 func Run(
 	ctx context.Context, conf *config.JobSearchConfig, since time.Time,
-) {
-	var wg sync.WaitGroup
+) error {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	var (
+		wg   sync.WaitGroup
+		mu   sync.Mutex
+		errs []error
+	)
 
 	start := func(
 		name string,
@@ -26,7 +38,11 @@ func Run(
 		go func() {
 			defer wg.Done()
 			if err := run(ctx, conf, since); err != nil {
-				slog.Error("source stopped", "source", name, "err", err)
+				slog.Error("source stopped, shutting down", "source", name, "err", err)
+				mu.Lock()
+				errs = append(errs, fmt.Errorf("%s: %w", name, err))
+				mu.Unlock()
+				cancel()
 			}
 		}()
 	}
@@ -42,4 +58,5 @@ func Run(
 	}
 
 	wg.Wait()
+	return errors.Join(errs...)
 }
diff --git a/internal/findATender/api.go b/internal/findATender/api.go
index dd1168c..c3d5ada 100644
--- a/internal/findATender/api.go
+++ b/internal/findATender/api.go
@@ -119,6 +119,8 @@ func recursiveRepairDates(v any) bool {
 	return changed
 }
 
+// isDateField reports whether a field holds a date, by its name (see
+// repairDates).
 func isDateField(name string) bool {
 	return strings.HasPrefix(name, "date") ||
 		strings.Contains(name, "Date") ||
@@ -322,10 +324,9 @@ func (ft *FindATender) fetchURI(
 		return nil, err
 	}
 
-	if ft.ctx == nil {
-		copied := *ft
-		copied.ctx = context.Background()
-		ft = &copied
+	ctx := ft.ctx
+	if ctx == nil {
+		ctx = context.Background()
 	}
 
 	if res.StatusCode() == 429 {
@@ -344,7 +345,7 @@ func (ft *FindATender) fetchURI(
 		slog.Warn(fmt.Sprintf(
 			"API rate limit hit, waiting as requested for %d seconds", retrySec,
 		))
-		if rateSleep(ft.ctx, time.Duration(retrySec)*time.Second) != nil {
+		if rateSleep(ctx, time.Duration(retrySec)*time.Second) != nil {
 			return nil, ErrFetchCancelled
 		}
 
diff --git a/internal/findATender/findATender.go b/internal/findATender/findATender.go
index f48e126..84688cf 100644
--- a/internal/findATender/findATender.go
+++ b/internal/findATender/findATender.go
@@ -16,8 +16,8 @@ type FindATender struct {
 	ctx        context.Context
 }
 
-func New(conf *config.JobSearchConfig, apiRoot string) FindATender {
-	ft := FindATender{
+func New(conf *config.JobSearchConfig, apiRoot string) *FindATender {
+	ft := &FindATender{
 		config:  conf,
 		apiRoot: apiRoot,
 	}