remove socket on exit; fix --position crash

This commit is contained in:
Harvey Tindall 2020-09-06 13:13:36 +01:00
parent 6ed1eb428f
commit 8343e713fe
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 13 additions and 2 deletions

15
main.go
View File

@ -8,6 +8,7 @@ import (
"log" "log"
"net" "net"
"os" "os"
"os/signal"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -428,6 +429,14 @@ func main() {
} }
go func() { go func() {
listener, err := net.Listen("unix", SOCK) listener, err := net.Listen("unix", SOCK)
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
go func() {
<-c
os.Remove(SOCK)
os.Exit(1)
}()
defer os.Remove(SOCK)
if err != nil { if err != nil {
log.Fatalln("Couldn't establish socket connection at", SOCK) log.Fatalln("Couldn't establish socket connection at", SOCK)
} }
@ -504,8 +513,10 @@ func main() {
go func() { go func() {
for { for {
time.Sleep(1000 * time.Millisecond) time.Sleep(1000 * time.Millisecond)
if players.list[players.current].playing { if len(players.list) != 0 {
go fmt.Println(players.JSON()) if players.list[players.current].playing {
go fmt.Println(players.JSON())
}
} }
} }
}() }()

Binary file not shown.