Skip to content

fix: max absence calculation continuously growing #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pfeifferj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: max absence calculation continuously growing #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,16 @@ func LastSeen() string {
return time.Unix(lastBeat.Timestamp, 0).Format(timeFormat)
}

// LongestAbsence will return HeartbeatStats.LongestMissingBeat unless the current missing beat is longer
// LongestAbsence returns the longest recorded absence between heartbeats
func LongestAbsence() string {
lastBeat := GetMostRecentBeat()

// This will happen when GetLastBeat returned a nil, and heartbeatDevices is empty
if lastBeat == nil {
heartbeatStats.LastBeatFormatted = "Never"
return "Never"
}

diff := time.Now().Unix() - lastBeat.Timestamp
// If current absence is bigger than record absence, return current absence
if diff > heartbeatStats.LongestMissingBeat {
heartbeatStats.LongestMissingBeat = diff
return FormattedTime(diff)
} else {
return FormattedTime(heartbeatStats.LongestMissingBeat)
}
return FormattedTime(heartbeatStats.LongestMissingBeat)
}

func UpdateNumDevices() {
Expand Down Expand Up @@ -189,27 +181,40 @@ func UpdateDevice(beat HeartbeatBeat) {
}

if n == -1 { // couldn't find an existing device with the name
device = HeartbeatDevice{beat.DeviceName, beat, 0, 0}
device = HeartbeatDevice{beat.DeviceName, beat, 1, 0}
// Don't calculate absence for new devices - append and return
*heartbeatDevices = append(*heartbeatDevices, device)
PostMessage("New device added", fmt.Sprintf("A new device called `%s` was added on <t:%v:d> at <t:%v:T>", beat.DeviceName, beat.Timestamp, beat.Timestamp), EmbedColorGreen, WebhookLevelSimple)
UpdateNumDevices()
return
}

// Validate timestamp to handle clock skew or duplicate beats
if beat.Timestamp <= device.LastBeat.Timestamp {
// Update device but don't calculate absence for non-advancing timestamps
device.LastBeat = beat
device.TotalBeats += 1
(*heartbeatDevices)[n] = device
UpdateTotalBeats()
return
}

diff := time.Now().Unix() - device.LastBeat.Timestamp
// Calculate the absence period that just ended (from old beat to new beat)
diff := beat.Timestamp - device.LastBeat.Timestamp
if diff > device.LongestMissingBeat {
device.LongestMissingBeat = diff
}
// We want to update the longest absence here (heartbeatStats.LongestMissingBeat) in case
// device.LongestMissingBeat > heartbeatStats.LongestMissingBeat *and* other devices haven't pinged recently
LongestAbsence()
// Update global longest absence if this device's absence is longer
if diff > heartbeatStats.LongestMissingBeat {
heartbeatStats.LongestMissingBeat = diff
}

device.LastBeat = beat
device.TotalBeats += 1
UpdateTotalBeats()

if n == -1 { // if device doesn't exist, append it, else replace it
*heartbeatDevices = append(*heartbeatDevices, device)
PostMessage("New device added", fmt.Sprintf("A new device called `%s` was added on <t:%v:d> at <t:%v:T>", beat.DeviceName, beat.Timestamp, beat.Timestamp), EmbedColorGreen, WebhookLevelSimple)
} else {
(*heartbeatDevices)[n] = device
}
// Update existing device in slice
(*heartbeatDevices)[n] = device
}

// UpdateLastBeat will save the last beat and insert a new HeartbeatBeat into beats
Expand Down