summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-09-24 22:27:26 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-09-24 22:27:26 (GMT)
commit17a799044bc20d18a07bbd12270ce3c079799dd9 (patch)
tree0877781335518b8d2b7212b006c2b0bf34b639d7
parenta547fe88a42d1e0aebfc01d5d90dd21fc101fc2e (diff)
some minor cleanup
-rw-r--r--src/rhctl/main.go9
-rw-r--r--web-static/socket.html7
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");
}