fixed output of websocket state command

3 files changed, 3 insertions, 1 deletions

diff --git a/src/rhctl/main.go b/src/rhctl/main.go
index 3ba8c45..809dd62 100644
--- a/src/rhctl/main.go
+++ b/src/rhctl/main.go
@@ -95,6 +95,7 @@ func main() {
 		}
 		servers = append(servers, server)
 	}
+	// TODO: re-enable this!
 	// if len(servers) <= 0 {
 	// 	rhl.Printf("Error: there is no playout server configured...")
 	// 	return
diff --git a/src/rhctl/web_socket.go b/src/rhctl/web_socket.go
index 8d68dc3..5f90100 100644
--- a/src/rhctl/web_socket.go
+++ b/src/rhctl/web_socket.go
@@ -65,6 +65,7 @@ func sendWebSocketStateResponse(ws *websocket.Conn, state State) {
 	rd.ResponseCode = http.StatusOK
 	rd.Type = "state"
 	rd.ErrorString = "OK"
+	rd.State = state
 	sendWebSocketResponse(ws, rd)
 }
 
diff --git a/web-static/socket.html b/web-static/socket.html
index fa20146..466431d 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("ws://localhost:4080/socket");
+        this.sock = new WebSocket("wss://rdimport.helsinki.at/rhctl/socket");
         this.sock_onmessage = function (event) {
           $('#statemsg').text(event.data);
         }