Browse Source

refactor: direttoforo.State

boyska 6 years ago
parent
commit
afbd5f2f69
2 changed files with 18 additions and 12 deletions
  1. 5 12
      cmd/direttoforo/main.go
  2. 13 0
      direttoforo.go

+ 5 - 12
cmd/direttoforo/main.go

@@ -8,26 +8,17 @@ import (
 	"os/signal"
 	"time"
 
+	"git.lattuga.net/boyska/direttoforo"
 	"git.lattuga.net/boyska/direttoforo/liquidsoap"
 	"git.lattuga.net/boyska/direttoforo/uiserver"
 )
 
-type State struct {
-	Streams map[string]liquidsoap.Stream
-}
-
-func NewState() State {
-	s := State{}
-	s.Streams = make(map[string]liquidsoap.Stream)
-	return s
-}
-
 func main() {
 	liqfile := flag.String("liq", "foo.liq", "Path to liquidsoap script to run")
 	bindpath := flag.String("bindpath", "/var/lib/direttoforo/ui.sock", "UNIX domain socket path for UIs")
 	flag.Parse()
 
-	state := NewState()
+	state := direttoforo.NewState()
 
 	netUIsock, err := net.Listen("unix", *bindpath)
 	if err != nil {
@@ -74,7 +65,9 @@ func main() {
 			t.Conn.SetDeadline(time.Now().Add(3 * time.Second))
 			outs, err := t.Outputs()
 			if err != nil {
-				fmt.Println("telnet cmd errored", err)
+				if err.Error() != "EOF" {
+					fmt.Println("telnet cmd errored", err)
+				}
 				continue
 			}
 			changed := false

+ 13 - 0
direttoforo.go

@@ -0,0 +1,13 @@
+package direttoforo
+
+import "git.lattuga.net/boyska/direttoforo/liquidsoap"
+
+type State struct {
+	Streams map[string]liquidsoap.Stream
+}
+
+func NewState() State {
+	s := State{}
+	s.Streams = make(map[string]liquidsoap.Stream)
+	return s
+}