Fixed new code for HttpServer. Had to add net.Addr field to the struct to hold addr and network to use in Stop() method.

cmd/dwelling-upload/main.go

@@ -78,16 +78,16 @@ func main() {
 	r.Handler(http.MethodGet, "/favicon.svg", duihttp.Favicon)
 
 	srv := duihttp.NewHttpServer(r)
+
+	if err := srv.Start(*listenAddress); err != nil {
+		log.Fatalln("failed to start a server:", err)
+	}
 	defer func() {
 		if err := srv.Stop(); err != nil {
 			log.Fatalln("failed to properly shutdown a server:", err)
 		}
 	}()
 
-	if err := srv.Start(*listenAddress); err != nil {
-		log.Fatalln("failed to start a server:", err)
-	}
-
 	doneSignal := make(chan os.Signal, 1)
 	signal.Notify(doneSignal, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 

internal/http/server.go

@@ -12,7 +12,8 @@ import (
 )
 
 type HttpServer struct {
-	s http.Server
+	s    http.Server
+	addr net.Addr
 }
 
 func NewHttpServer(r http.Handler) *HttpServer {
@@ -26,7 +27,6 @@ func (s *HttpServer) Start(address string) error {
 	var network string
 	if !strings.ContainsRune(address, ':') {
 		network = "unix"
-		defer os.Remove(address)
 	} else {
 		ap, err := netip.ParseAddrPort(address)
 		if err != nil {
@@ -49,6 +49,8 @@ func (s *HttpServer) Start(address string) error {
 		os.Chmod(address, 0777)
 	}
 
+	s.addr = listener.Addr()
+
 	go func() {
 		if err = s.s.Serve(listener); err != nil && err != http.ErrServerClosed {
 			log.Fatalln(err)
@@ -62,6 +64,10 @@ func (s *HttpServer) Stop() error {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
+	if s.addr.Network() == "unix" {
+		defer os.Remove(s.addr.String())
+	}
+
 	if err := s.s.Shutdown(ctx); err != nil {
 		return err
 	}