Merge branch 'master' into resolve-race

Author: daveads

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version-file: ./go.mod
           cache: true

xhttp/serve.go

@@ -65,28 +65,26 @@ func Serve(ctx context.Context, shutdownTimeout time.Duration, s *http.Server, l
 		return ctx
 	}
 
-	ss := newSafeServer(s)
-
-	serverClosed := make(chan struct{})
-	var serverError error
-	go func() {
-		serverError = ss.ListenAndServe(l)
-		close(serverClosed)
-	}()
-
-	select {
-	case <-serverClosed:
-		return serverError
-	case <-ctx.Done():
-		shutdownCtx, cancel := context.WithTimeout(xcontext.WithoutCancel(ctx), shutdownTimeout)
-		defer cancel()
-
-		err := ss.Shutdown(shutdownCtx)
-		<-serverClosed // Wait for server to exit
-		if err != nil {
-			return err
-		}
-		return serverError
-	}
-
-}
+  ss := newSafeServer(s)
+
+  serverClosed := make(chan struct{})
+  var serverError error
+  go func() {
+    serverError = ss.ListenAndServe(l)
+    close(serverClosed)
+  }()
+
+  select {
+  case <-serverClosed:
+    return serverError
+  case <-ctx.Done():
+    shutdownCtx, cancel := context.WithTimeout(xcontext.WithoutCancel(ctx), shutdownTimeout)
+    defer cancel()
+    err := ss.Shutdown(shutdownCtx)
+    <-serverClosed // Wait for server to exit
+    if err != nil {
+      return err
+    }
+    return serverError
+  }
+}