Merge branch 'master' into audiopath

This commit is contained in:
Trek H 2021-02-15 10:55:06 +10:30
commit 594d1c4f5c
1 changed files with 9 additions and 7 deletions

View File

@ -136,13 +136,15 @@ func extractMeta(r string, log func(lvl int8, msg string, args ...interface{}))
if err != nil { if err != nil {
return nil return nil
} }
// Extract time from reply // Extract time from reply if mts.Realtime has not been set.
t, err := dec.Int("ts") if !mts.RealTime.IsSet() {
if err != nil { t, err := dec.Int("ts")
log(logger.Warning, "No timestamp in reply") if err != nil {
} else { log(logger.Warning, "No timestamp in reply")
log(logger.Debug, fmt.Sprintf("got timestamp: %v", t)) } else {
mts.RealTime.Set(time.Unix(int64(t), 0)) log(logger.Debug, "got timestamp", "ts", t)
mts.RealTime.Set(time.Unix(int64(t), 0))
}
} }
// Extract location from reply // Extract location from reply