diff options
| -rw-r--r-- | src/rhctl/main.go | 9 | ||||
| -rw-r--r-- | web-static/socket.html | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/rhctl/main.go b/src/rhctl/main.go index 809dd62..b0b57e6 100644 --- a/src/rhctl/main.go +++ b/src/rhctl/main.go @@ -95,11 +95,10 @@ func main() { } servers = append(servers, server) } - // TODO: re-enable this! - // if len(servers) <= 0 { - // rhl.Printf("Error: there is no playout server configured...") - // return - // } + if len(servers) <= 0 { + rhl.Printf("Error: there is no playout server configured...") + return + } ctrl := SwitchControlInit(conf, sw, servers) diff --git a/web-static/socket.html b/web-static/socket.html index cf367e3..c0939da 100644 --- a/web-static/socket.html +++ b/web-static/socket.html @@ -38,7 +38,7 @@ <script type="text/javascript"> function State(req) { this.req = req - this.sock = new WebSocket("wss://rdimport.helsinki.at/rhctl/socket"); + this.sock = new WebSocket("ws://localhost:4080/socket"); this.sock_onmessage = function (event) { $('#statemsg').text(event.data); } @@ -58,13 +58,10 @@ s = new State(req); } - function init() { - $('#buttonstate').removeAttr('disabled','disabled'); - } function Subscription(req) { this.req = req - this.sock = new WebSocket("wss://rdimport.helsinki.at/rhctl/socket"); + this.sock = new WebSocket("ws://localhost:4080/socket"); this.sock_onmessage = function (event) { $('#rawmsg').append(event.data + "\n\n"); } |