Skip to content
Snippets Groups Projects
Commit 7bf35dbe authored by Hans Moog's avatar Hans Moog
Browse files

Fix: fixed bug in html template of dashboard

parent d043853f
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,6 @@ package dashboard ...@@ -2,7 +2,6 @@ package dashboard
import ( import (
"encoding/binary" "encoding/binary"
"fmt"
"html/template" "html/template"
"net/http" "net/http"
...@@ -27,11 +26,13 @@ func ServeWs(w http.ResponseWriter, r *http.Request) { ...@@ -27,11 +26,13 @@ func ServeWs(w http.ResponseWriter, r *http.Request) {
} }
notifyWebsocketClient := events.NewClosure(func(sampledTPS uint64) { notifyWebsocketClient := events.NewClosure(func(sampledTPS uint64) {
p := make([]byte, 4) go func() {
binary.LittleEndian.PutUint32(p, uint32(sampledTPS)) p := make([]byte, 4)
if err := ws.WriteMessage(websocket.BinaryMessage, p); err != nil { binary.LittleEndian.PutUint32(p, uint32(sampledTPS))
return if err := ws.WriteMessage(websocket.BinaryMessage, p); err != nil {
} return
}
}()
}) })
metrics.Events.ReceivedTPSUpdated.Attach(notifyWebsocketClient) metrics.Events.ReceivedTPSUpdated.Attach(notifyWebsocketClient)
...@@ -42,8 +43,6 @@ func ServeWs(w http.ResponseWriter, r *http.Request) { ...@@ -42,8 +43,6 @@ func ServeWs(w http.ResponseWriter, r *http.Request) {
} }
} }
fmt.Println("DISCONNECTOR")
metrics.Events.ReceivedTPSUpdated.Detach(notifyWebsocketClient) metrics.Events.ReceivedTPSUpdated.Detach(notifyWebsocketClient)
} }
......
...@@ -286,17 +286,20 @@ var tpsTemplate = ` ...@@ -286,17 +286,20 @@ var tpsTemplate = `
} }
}] }]
}); });
const dataStr = '{{.Data}}'
const parsedData = JSON.parse(dataStr.replace(/ /g, ','));
time = Date.now() - 1000 * (parsedData.length + 1);
for (let i = 0; i < parsedData.length; i++) {
chart.series[0].addPoint([time += 1000, parseInt(parsedData[i], 10)], false);
}
chart.redraw();
console.log(parsedData);
const conn = new WebSocket("ws://{{.Host}}/ws"); const conn = new WebSocket("ws://{{.Host}}/ws");
conn.binaryType = 'arraybuffer'; conn.binaryType = 'arraybuffer';
conn.onopen = evt => { conn.onopen = evt => {
console.log("WebSocket is open now."); console.log("WebSocket is open now.");
const dataStr = '{{.Data}}'
const data = JSON.parse(dataStr.replace(/ /g, ','));
time = Date.now() - 1000 * (data.length + 1);
for (let i = 0; i < data.length; i++) {
chart.series[0].addPoint([time += 1000, parseInt(data[i], 10)], true);
}
console.log(data);
console.log("WebSocket done."); console.log("WebSocket done.");
} }
conn.onclose = () => { conn.onclose = () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment