oversight: upgrade minimum Go version

easy/easy_example_test.go

@@ -17,7 +17,7 @@ package easy_test
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"sync"
 	"time"
@@ -29,7 +29,7 @@ func Example() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	var wg sync.WaitGroup
-	ctx = oversight.WithContext(ctx, oversight.WithLogger(log.New(ioutil.Discard, "", 0)))
+	ctx = oversight.WithContext(ctx, oversight.WithLogger(log.New(io.Discard, "", 0)))
 	wg.Add(1)
 	serviceName, err := oversight.Add(ctx, func(ctx context.Context) error {
 		select {

go.mod

@@ -1,3 +1,3 @@
 module cirello.io/oversight
 
-go 1.12
+go 1.22

tree.go

@@ -17,7 +17,7 @@ package oversight
 import (
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"log"
 	"sync"
 	"time"
@@ -114,7 +114,7 @@ func (t *Tree) init() {
 			DefaultRestartStrategy()(t)
 		}
 		if t.logger == nil {
-			t.logger = log.New(ioutil.Discard, "", 0)
+			t.logger = log.New(io.Discard, "", 0)
 		}
 		t.children = make(map[string]childProcess)
 		t.stopped = make(chan struct{})
@@ -264,25 +264,23 @@ func (t *Tree) Start(rootCtx context.Context) error {
 	defer cancel()
 	t.gracefulCancel = cancel
 	for {
-		select {
-		case <-ctx.Done():
-			return t.drain(ctx)
-		default:
-			t.startChildProcesses(ctx, cancel)
-			t.handleTreeChanges(ctx, cancel)
+		if ctx.Err() != nil {
+			return t.drain()
 		}
+		t.startChildProcesses(ctx, cancel)
+		t.handleTreeChanges(ctx, cancel)
 	}
 }
 
-func (t *Tree) drain(ctx context.Context) error {
+func (t *Tree) drain() error {
 	select {
 	case <-t.stopped:
 		return ErrTreeNotRunning
 	default:
 	}
 	close(t.stopped)
 	defer t.logger.Printf("clean up complete")
-	t.logger.Printf("context canceled (before start): %v", ctx.Err())
+	t.logger.Printf("draining")
 	t.semaphore.Lock()
 	for i := len(t.childrenOrder) - 1; i >= 0; i-- {
 		procName := t.childrenOrder[i]