fix: 7b004463 part two
This commit is contained in:
parent
7b0044634a
commit
35096d1ed5
2 changed files with 17 additions and 14 deletions
|
|
@ -63,22 +63,25 @@ func HandleComputerWebSocket(w http.ResponseWriter, r *http.Request) {
|
||||||
// Mark computer offline
|
// Mark computer offline
|
||||||
service.ComputerData.Online = false
|
service.ComputerData.Online = false
|
||||||
|
|
||||||
// Calculate uptime
|
// Calculate uptime only if we have a valid start time
|
||||||
sessionUptime := int(time.Now().Unix()) - service.ComputerData.UptimeStart
|
if service.ComputerData.UptimeStart > 0 {
|
||||||
|
// Calculate uptime
|
||||||
|
sessionUptime := int(time.Now().Unix()) - service.ComputerData.UptimeStart
|
||||||
|
|
||||||
// Get current total uptime from data store
|
// Get current total uptime from data store
|
||||||
totalUptimeData := storage.GlobalDataStore.Get("uptime")
|
totalUptimeData := storage.GlobalDataStore.Get("uptime")
|
||||||
var totalUptime float64
|
var totalUptime float64
|
||||||
if totalUptimeData != nil {
|
if totalUptimeData != nil {
|
||||||
totalUptime = totalUptimeData.(float64)
|
totalUptime = totalUptimeData.(float64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to totals
|
||||||
|
service.ComputerData.Totals.Uptime = totalUptime + float64(sessionUptime)
|
||||||
|
storage.GlobalDataStore.Set("uptime", service.ComputerData.Totals.Uptime)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add to totals
|
// Set uptime start to -1 (computer is offline)
|
||||||
service.ComputerData.Totals.Uptime = totalUptime + float64(sessionUptime)
|
service.ComputerData.UptimeStart = -1
|
||||||
storage.GlobalDataStore.Set("uptime", service.ComputerData.Totals.Uptime)
|
|
||||||
|
|
||||||
// Reset uptime start (computer is offline)
|
|
||||||
service.ComputerData.UptimeStart = 0
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import (
|
||||||
|
|
||||||
var ComputerData model.ComputerData = model.ComputerData{
|
var ComputerData model.ComputerData = model.ComputerData{
|
||||||
Online: false,
|
Online: false,
|
||||||
UptimeStart: 0,
|
UptimeStart: -1,
|
||||||
Totals: model.ComputerTotals{
|
Totals: model.ComputerTotals{
|
||||||
Uptime: 0,
|
Uptime: 0,
|
||||||
Keys: 0,
|
Keys: 0,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue