summaryrefslogtreecommitdiff
path: root/src/rhctl/playout_server.go
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-03-26 19:57:22 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2016-03-26 19:57:22 (GMT)
commitaf3c3e7cf792eb21e5fe9c96237723561644b7c4 (patch)
tree9ccef4c38060db5088019e2ee375bd35f508909b /src/rhctl/playout_server.go
parentf27fa7e80e6052ce927b064bf9292dd94a480f39 (diff)
disconnecting serial devices is now properly handled
Diffstat (limited to 'src/rhctl/playout_server.go')
-rw-r--r--src/rhctl/playout_server.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rhctl/playout_server.go b/src/rhctl/playout_server.go
index 5491b23..276c462 100644
--- a/src/rhctl/playout_server.go
+++ b/src/rhctl/playout_server.go
@@ -43,10 +43,10 @@ type PlayoutServer struct {
func (srv *PlayoutServer) Run() {
rhdl.Printf("running playout server: %s", srv.name)
- srv.control.tx <- fmt.Sprintf("hello %s", srv.name)
- srv.heartbeat.tx <- fmt.Sprintf("beat %s", srv.name)
- time.Sleep(5 * time.Second)
+ for {
+ time.Sleep(time.Second)
+ }
}
func ServerInit(name string, conf *Config) (srv *PlayoutServer, err error) {
@@ -55,11 +55,11 @@ func ServerInit(name string, conf *Config) (srv *PlayoutServer, err error) {
srv.health = Dead
srv.channel = "music"
- if srv.control, err = SerialOpenAndHandle(conf.Servers[name].ControlDevice, conf.Servers[name].ControlBaudrate, "\r\n"); err != nil {
+ if srv.control, err = SerialOpen(conf.Servers[name].ControlDevice, conf.Servers[name].ControlBaudrate, "\r\n"); err != nil {
err = fmt.Errorf("Error opening control port(%s): %s", srv.name, err)
return
}
- if srv.heartbeat, err = SerialOpenAndHandle(conf.Servers[name].HeartbeatDevice, conf.Servers[name].HeartbeatBaudrate, "\r\n"); err != nil {
+ if srv.heartbeat, err = SerialOpen(conf.Servers[name].HeartbeatDevice, conf.Servers[name].HeartbeatBaudrate, "\r\n"); err != nil {
err = fmt.Errorf("Error opening control port(%s): %s", srv.name, err)
return
}