Fix going away

Emyrk · Emyrk · commit 98a7740255ef · 2023-05-08T17:17:28.000-05:00
diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -250,11 +250,12 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
 
 func (s *Server) Close() error {
 	s.cancel()
-	go func() {
-		// Do this in a go routine to not block the close. This is allowed
-		// to fail, it is just a courtesy to the dashboard.
-		_ = s.SDKClient.WorkspaceProxyGoingAway(context.Background())
-	}()
+
+	// A timeout to prevent the SDK from blocking the server shutdown.
+	tmp, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+	_ = s.SDKClient.WorkspaceProxyGoingAway(tmp)
+
 	return s.AppServer.Close()
 }
 
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -1485,12 +1485,12 @@ export const ProvisionerTypes: ProvisionerType[] = ["echo", "terraform"]
 
 // From codersdk/workspaceproxy.go
 export type ProxyHealthStatus =
-  | "reachable"
+  | "ok"
   | "unhealthy"
   | "unreachable"
   | "unregistered"
 export const ProxyHealthStatuses: ProxyHealthStatus[] = [
-  "reachable",
+  "ok",
   "unhealthy",
   "unreachable",
   "unregistered",
