From 58d843ae7e853d586e5e85b87e823fcbf4666034 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Fri, 27 Jul 2018 14:09:31 +0200 Subject: [PATCH] fix some issues on connect --- webroot/css/styles.less | 4 ++-- webroot/js/socket.js | 4 ++-- websocket/hd_connect.go | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/webroot/css/styles.less b/webroot/css/styles.less index 62fe0a2..8527b31 100644 --- a/webroot/css/styles.less +++ b/webroot/css/styles.less @@ -66,8 +66,8 @@ table.nodes tbody tr:nth-child(odd) { table.nodes tbody tr:hover { background: #ccc; } -table.nodes tbody tr.offline:first-child, -table.nodes tbody tr.offline:hover:first-child{ +table.nodes tbody tr.offline td:first-child, +table.nodes tbody tr.offline:hover td:first-child{ background: #dc0067; } table.nodes tbody tr.unseen:first-child{ diff --git a/webroot/js/socket.js b/webroot/js/socket.js index 0df0b3e..2c6f717 100644 --- a/webroot/js/socket.js +++ b/webroot/js/socket.js @@ -44,6 +44,8 @@ function onerror (err) { function onopen () { connectionEstablished = true; + sendjson({'subject': 'auth_status'}); + sendjson({'subject': 'connect'}); render(); } @@ -123,8 +125,6 @@ function connect () { socket.onerror = onerror; socket.onmessage = onmessage; socket.onclose = onclose; - sendjson({'subject': 'auth_status'}); - sendjson({'subject': 'connect'}); } window.setInterval(() => { diff --git a/websocket/hd_connect.go b/websocket/hd_connect.go index 121909c..cf0b13e 100644 --- a/websocket/hd_connect.go +++ b/websocket/hd_connect.go @@ -21,7 +21,12 @@ func (ws *WebsocketServer) connectHandler(logger *log.Entry, msg *wsLib.Message) ws.nodes.Lock() i := 0 for _, node := range ws.nodes.List { - msg.From.Write(&wsLib.Message{Subject: MessageTypeCurrentNode, Body: node}) + n := runtime.NewNode(node, "") + if n == nil { + continue + } + n.Lastseen = node.Lastseen + msg.From.Write(&wsLib.Message{Subject: MessageTypeCurrentNode, Body: n}) i++ } ws.nodes.Unlock()