mirror of
https://github.com/nkanaev/yarr.git
synced 2025-05-25 21:49:20 +00:00
Compare commits
No commits in common. "9762e09cb3e99d2594f7bfc974fc15292de9c564" and "c348593ef4af350eaad92925cf9684f5947d70cb" have entirely different histories.
9762e09cb3
...
c348593ef4
@ -90,10 +90,6 @@ func main() {
|
|||||||
log.SetOutput(os.Stdout)
|
log.SetOutput(os.Stdout)
|
||||||
}
|
}
|
||||||
|
|
||||||
if open && strings.HasPrefix(addr, "unix:") {
|
|
||||||
log.Fatal("Cannot open ", addr, " in browser")
|
|
||||||
}
|
|
||||||
|
|
||||||
if db == "" {
|
if db == "" {
|
||||||
configPath, err := os.UserConfigDir()
|
configPath, err := os.UserConfigDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
# upcoming
|
# upcoming
|
||||||
|
|
||||||
- (new) serve on unix socket (thanks to @rvighne)
|
|
||||||
|
|
||||||
# v2.5 (2025-03-26)
|
|
||||||
|
|
||||||
- (new) Fever API support (thanks to @icefed)
|
- (new) Fever API support (thanks to @icefed)
|
||||||
- (new) editable feed link (thanks to @adaszko)
|
- (new) editable feed link (thanks to @adaszko)
|
||||||
|
@ -2,10 +2,7 @@ package server
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/nkanaev/yarr/src/storage"
|
"github.com/nkanaev/yarr/src/storage"
|
||||||
@ -56,31 +53,14 @@ func (s *Server) Start() {
|
|||||||
s.worker.RefreshFeeds()
|
s.worker.RefreshFeeds()
|
||||||
}
|
}
|
||||||
|
|
||||||
var ln net.Listener
|
httpserver := &http.Server{Addr: s.Addr, Handler: s.handler()}
|
||||||
|
|
||||||
var err error
|
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 != "" {
|
if s.CertFile != "" && s.KeyFile != "" {
|
||||||
err = httpserver.ServeTLS(ln, s.CertFile, s.KeyFile)
|
err = httpserver.ListenAndServeTLS(s.CertFile, s.KeyFile)
|
||||||
ln.Close()
|
|
||||||
} else {
|
} else {
|
||||||
err = httpserver.Serve(ln)
|
err = httpserver.ListenAndServe()
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != http.ErrServerClosed {
|
if err != http.ErrServerClosed {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user