mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-10 08:40:28 +00:00
Fix formatting of bytes_sent, bytes_recvd, last_seen, uptime
This commit is contained in:
parent
cc4ee91279
commit
59688dcab3
@ -434,12 +434,17 @@ func (a *admin) getData_getPeers() []admin_nodeInfo {
|
|||||||
for _, port := range ps {
|
for _, port := range ps {
|
||||||
p := ports[port]
|
p := ports[port]
|
||||||
addr := *address_addrForNodeID(getNodeID(&p.box))
|
addr := *address_addrForNodeID(getNodeID(&p.box))
|
||||||
|
duration := time.Since(p.firstSeen)
|
||||||
info := admin_nodeInfo{
|
info := admin_nodeInfo{
|
||||||
{"ip", net.IP(addr[:]).String()},
|
{"ip", net.IP(addr[:]).String()},
|
||||||
{"port", port},
|
{"port", port},
|
||||||
{"uptime", fmt.Sprint(time.Since(p.firstSeen))},
|
{"uptime", fmt.Sprintf("%02d:%02d:%02d",
|
||||||
{"bytes_sent", atomic.LoadUint64(&p.bytesSent)},
|
int(duration.Hours()),
|
||||||
{"bytes_recvd", atomic.LoadUint64(&p.bytesRecvd)},
|
int(duration.Minutes())%60,
|
||||||
|
int(duration.Seconds())%60,
|
||||||
|
)},
|
||||||
|
{"bytes_sent", fmt.Sprintf("%d", atomic.LoadUint64(&p.bytesSent))},
|
||||||
|
{"bytes_recvd", fmt.Sprintf("%d", atomic.LoadUint64(&p.bytesRecvd))},
|
||||||
}
|
}
|
||||||
peerInfos = append(peerInfos, info)
|
peerInfos = append(peerInfos, info)
|
||||||
}
|
}
|
||||||
@ -481,7 +486,7 @@ func (a *admin) getData_getDHT() []admin_nodeInfo {
|
|||||||
{"coords", fmt.Sprint(v.coords)},
|
{"coords", fmt.Sprint(v.coords)},
|
||||||
{"bucket", i},
|
{"bucket", i},
|
||||||
{"peer_only", isPeer},
|
{"peer_only", isPeer},
|
||||||
{"last_seen", fmt.Sprint(now.Sub(v.recv))},
|
{"last_seen", fmt.Sprintf("%ds", int(now.Sub(v.recv).Seconds()))},
|
||||||
}
|
}
|
||||||
infos = append(infos, info)
|
infos = append(infos, info)
|
||||||
}
|
}
|
||||||
@ -504,8 +509,8 @@ func (a *admin) getData_getSessions() []admin_nodeInfo {
|
|||||||
{"coords", fmt.Sprint(sinfo.coords)},
|
{"coords", fmt.Sprint(sinfo.coords)},
|
||||||
{"mtu", sinfo.getMTU()},
|
{"mtu", sinfo.getMTU()},
|
||||||
{"was_mtu_fixed", sinfo.wasMTUFixed},
|
{"was_mtu_fixed", sinfo.wasMTUFixed},
|
||||||
{"bytes_sent", sinfo.bytesSent},
|
{"bytes_sent", fmt.Sprintf("%d", sinfo.bytesSent)},
|
||||||
{"bytes_recvd", sinfo.bytesRecvd},
|
{"bytes_recvd", fmt.Sprintf("%d", sinfo.bytesRecvd)},
|
||||||
}
|
}
|
||||||
infos = append(infos, info)
|
infos = append(infos, info)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user