cmd/yarr/main.go

@@ -90,10 +90,6 @@ func main() {
 		log.SetOutput(os.Stdout)
 	}
 
-	if open && strings.HasPrefix(addr, "unix:") {
-		log.Fatal("Cannot open ", addr, " in browser")
-	}
-
 	if db == "" {
 		configPath, err := os.UserConfigDir()
 		if err != nil {

doc/changelog.txt

@@ -1,9 +1,5 @@
 # upcoming 
 
-- (new) serve on unix socket (thanks to @rvighne)
-
-# v2.5 (2025-03-26)
-
 - (new) Fever API support (thanks to @icefed)
 - (new) editable feed link (thanks to @adaszko)
 - (new) switch to feed by clicking the title in the article page (thanks to @tarasglek for suggestion)

src/server/server.go

@@ -2,10 +2,7 @@ package server
 
 import (
 	"log"
-	"net"
 	"net/http"
-	"os"
-	"strings"
 	"sync"
 
 	"github.com/nkanaev/yarr/src/storage"
@@ -56,31 +53,14 @@ func (s *Server) Start() {
 		s.worker.RefreshFeeds()
 	}
 
-	var ln net.Listener
+	httpserver := &http.Server{Addr: s.Addr, Handler: s.handler()}
+
 	var err error
-
-	if path, isUnix := strings.CutPrefix(s.Addr, "unix:"); isUnix {
-		err = os.Remove(path)
-		if err != nil {
-			log.Print(err)
-		}
-		ln, err = net.Listen("unix", path)
-	} else {
-		ln, err = net.Listen("tcp", s.Addr)
-	}
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	httpserver := &http.Server{Handler: s.handler()}
 	if s.CertFile != "" && s.KeyFile != "" {
-		err = httpserver.ServeTLS(ln, s.CertFile, s.KeyFile)
-		ln.Close()
+		err = httpserver.ListenAndServeTLS(s.CertFile, s.KeyFile)
 	} else {
-		err = httpserver.Serve(ln)
+		err = httpserver.ListenAndServe()
 	}
-
 	if err != http.ErrServerClosed {
 		log.Fatal(err)
 	}