a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify ws dashboard stat push code

This commit is contained in:
Azareal 2020-02-05 12:29:35 +10:00
parent 0c1d6f0516
commit 4ae2200760
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/websockets.go
View File

@ -160,7 +160,7 @@ func wsPageResponses(wsUser *WSUser, conn *websocket.Conn, page string) {
if !Forums.Exists(topic.ParentID) { if !Forums.Exists(topic.ParentID) {
return return
} }
var usercpy *User = BlankUser() usercpy := BlankUser()
*usercpy = *wsUser.User *usercpy = *wsUser.User
usercpy.Init() usercpy.Init()
@ -304,7 +304,7 @@ func adminStatsTicker() {
var totunit, uunit, gunit string var totunit, uunit, gunit string
lessThanSwitch := func(number int, lowerBound int, midBound int) string { lessThanSwitch := func(number, lowerBound, midBound int) string {
switch { switch {
case number < lowerBound: case number < lowerBound:
return "stat_green" return "stat_green"
@ -313,8 +313,7 @@ func adminStatsTicker() {
} }
return "stat_red" return "stat_red"
} }
greaterThanSwitch := func(number, lowerBound, midBound int) string {
greaterThanSwitch := func(number int, lowerBound int, midBound int) string {
switch { switch {
case number > midBound: case number > midBound:
return "stat_green" return "stat_green"
@ -411,26 +410,32 @@ AdminStatLoop:
// nolint // nolint
// TODO: Use JSON for this to make things more portable and easier to convert to MessagePack, if need be? // TODO: Use JSON for this to make things more portable and easier to convert to MessagePack, if need be?
if !noStatUpdates { write := func(msg string) {
w.Write([]byte("set #dash-totonline <span>" + p.GetTmplPhrasef("panel_dashboard_online", totonline, totunit) + "</span>\r")) w.Write([]byte(msg + "\r"))
w.Write([]byte("set #dash-gonline <span>" + p.GetTmplPhrasef("panel_dashboard_guests_online", gonline, gunit) + "</span>\r"))
w.Write([]byte("set #dash-uonline <span>" + p.GetTmplPhrasef("panel_dashboard_users_online", uonline, uunit) + "</span>\r"))
w.Write([]byte("set #dash-reqs <span>" + strconv.Itoa(reqCount) + " reqs / second</span>\r"))
w.Write([]byte("set-class #dash-totonline grid_item grid_stat " + onlineColour + "\r"))
w.Write([]byte("set-class #dash-gonline grid_item grid_stat " + onlineGuestsColour + "\r"))
w.Write([]byte("set-class #dash-uonline grid_item grid_stat " + onlineUsersColour + "\r"))
//w.Write([]byte("set-class #dash-reqs grid_item grid_stat grid_end_group \r"))
} }
push := func(id, msg string) {
w.Write([]byte("set #dash-cpu <span>" + p.GetTmplPhrasef("panel_dashboard_cpu",cpustr) + "%</span>\r")) write("set #" + id + " <span>"+msg+"</span>")
w.Write([]byte("set-class #dash-cpu grid_item grid_istat " + cpuColour + "\r")) }
pushc := func(id, classes string) {
write("set-class #" + id + " " + classes)
}
if !noStatUpdates {
push("dash-totonline",p.GetTmplPhrasef("panel_dashboard_online", totonline, totunit))
push("dash-gonline",p.GetTmplPhrasef("panel_dashboard_guests_online", gonline, gunit))
push("dash-uonline",p.GetTmplPhrasef("panel_dashboard_users_online", uonline, uunit))
push("dash-reqs",strconv.Itoa(reqCount) + " reqs / second")
pushc("dash-totonline","grid_item grid_stat " + onlineColour)
pushc("dash-gonline","grid_item grid_stat " + onlineGuestsColour)
pushc("dash-uonline","grid_item grid_stat " + onlineUsersColour)
//pushc("dash-reqs","grid_item grid_stat grid_end_group")
}
push("dash-cpu",p.GetTmplPhrasef("panel_dashboard_cpu",cpustr) + "%")
pushc("dash-cpu","grid_item grid_istat " + cpuColour)
if !noRAMUpdates { if !noRAMUpdates {
w.Write([]byte("set #dash-ram <span>" + p.GetTmplPhrasef("panel_dashboard_ram",ramstr) + "</span>\r")) push("dash-ram", p.GetTmplPhrasef("panel_dashboard_ram",ramstr))
w.Write([]byte("set-class #dash-ram grid_item grid_istat " + ramColour + "\r")) pushc("dash-ram","grid_item grid_istat " + ramColour)
} }
w.Close() w.Close()
} }
adminStatsMutex.Unlock() adminStatsMutex.Unlock()