mirror of
https://github.com/owncast/owncast.git
synced 2024-11-21 20:28:15 +03:00
Fix invalid nil time being returned
This commit is contained in:
parent
2c2736aef9
commit
d28c4b96f3
2 changed files with 3 additions and 9 deletions
|
@ -328,7 +328,7 @@ func SetPeakOverallViewerCount(count int) error {
|
|||
|
||||
// GetLastDisconnectTime will return the time the last stream ended.
|
||||
func GetLastDisconnectTime() (utils.NullTime, error) {
|
||||
var disconnectTime utils.NullTime
|
||||
var disconnectTime = utils.NullTime{time.Now(), false}
|
||||
configEntry, err := _datastore.Get(lastDisconnectTimeKey)
|
||||
if err != nil {
|
||||
return disconnectTime, err
|
||||
|
|
|
@ -11,7 +11,6 @@ import (
|
|||
"github.com/owncast/owncast/core/data"
|
||||
"github.com/owncast/owncast/geoip"
|
||||
"github.com/owncast/owncast/models"
|
||||
"github.com/owncast/owncast/utils"
|
||||
)
|
||||
|
||||
var l = &sync.RWMutex{}
|
||||
|
@ -145,19 +144,14 @@ func saveStats() error {
|
|||
}
|
||||
|
||||
func getSavedStats() models.Stats {
|
||||
savedLastDisconnectTime, savedLastDisconnectTimeErr := data.GetLastDisconnectTime()
|
||||
|
||||
var lastDisconnectTime utils.NullTime
|
||||
if savedLastDisconnectTimeErr == nil && savedLastDisconnectTime.Valid {
|
||||
lastDisconnectTime = savedLastDisconnectTime
|
||||
}
|
||||
savedLastDisconnectTime, _ := data.GetLastDisconnectTime()
|
||||
|
||||
result := models.Stats{
|
||||
ChatClients: make(map[string]models.Client),
|
||||
Viewers: make(map[string]time.Time),
|
||||
SessionMaxViewerCount: data.GetPeakSessionViewerCount(),
|
||||
OverallMaxViewerCount: data.GetPeakOverallViewerCount(),
|
||||
LastDisconnectTime: lastDisconnectTime,
|
||||
LastDisconnectTime: savedLastDisconnectTime,
|
||||
}
|
||||
|
||||
// If the stats were saved > 5min ago then ignore the
|
||||
|
|
Loading…
Reference in a new issue