Merge 76e5e54a67 into a51da7b8ec

cmd/yarr/main.go

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

src/server/server.go

@@ -2,7 +2,10 @@ package server
 
 import (
 	"log"
+	"net"
 	"net/http"
+	"os"
+	"strings"
 	"sync"
 
 	"github.com/nkanaev/yarr/src/storage"
@@ -53,14 +56,28 @@ func (s *Server) Start() {
 		s.worker.RefreshFeeds()
 	}
 
-	httpserver := &http.Server{Addr: s.Addr, Handler: s.handler()}
+	network := "tcp"
-
+	if strings.ContainsRune(s.Addr, os.PathSeparator) {
-	var err error
+		network = "unix"
-	if s.CertFile != "" && s.KeyFile != "" {
+		err := os.Remove(s.Addr)
-		err = httpserver.ListenAndServeTLS(s.CertFile, s.KeyFile)
+		if err != nil {
-	} else {
+			log.Fatal(err)
-		err = httpserver.ListenAndServe()
+		}
 	}
+
+	ln, err := net.Listen(network, 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()
+	} else {
+		err = httpserver.Serve(ln)
+	}
+
 	if err != http.ErrServerClosed {
 		log.Fatal(err)
 	}