Merge pull request #3939 from norio-nomura/close-hostagent-server

AkihiroSuda · web-flow · commit 76af1b1116a3 · 2025-09-01T19:49:38.000+09:00
`hostagent`: Fix: `ha.sock` was not removed on exit
diff --git a/cmd/limactl/hostagent.go b/cmd/limactl/hostagent.go
@@ -125,12 +125,11 @@ func hostagentAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	go func() {
-		defer os.RemoveAll(socket)
-		defer srv.Close()
 		if serveErr := srv.Serve(l); serveErr != http.ErrServerClosed {
 			logrus.WithError(serveErr).Warn("hostagent API server exited with an error")
 		}
 	}()
+	defer srv.Close()
 	return ha.Run(cmd.Context())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,11 @@ func hostagentAction(cmd *cobra.Command, args []string) error {`
`125`	`125`	`return err`
`126`	`126`	`}`
`127`	`127`	`go func() {`
`128`		`- defer os.RemoveAll(socket)`
`129`		`- defer srv.Close()`
`130`	`128`	`if serveErr := srv.Serve(l); serveErr != http.ErrServerClosed {`
`131`	`129`	`logrus.WithError(serveErr).Warn("hostagent API server exited with an error")`
`132`	`130`	`}`
`133`	`131`	`}()`
	`132`	`+ defer srv.Close()`
`134`	`133`	`return ha.Run(cmd.Context())`
`135`	`134`	`}`
`136`	`135`