astra
/
plc-mirror
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use LastRecordTimestamp in serve() instead of LastSuccess

main^2
Max Ignatenko 2024-11-14 12:36:39 +00:00
parent b26866fe0c
commit 04ab6167c7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/plc-mirror/serve.go
View File

@ -66,7 +66,11 @@ func (s *Server) serve(ctx context.Context, req *http.Request) convreq.HttpRespo
requestLatency.WithLabelValues(fmt.Sprint(c)).Observe(float64(time.Now().Sub(start)) / float64(time.Millisecond)) requestLatency.WithLabelValues(fmt.Sprint(c)).Observe(float64(time.Now().Sub(start)) / float64(time.Millisecond))
} }
delay := time.Since(s.mirror.LastSuccess()) ts, err := s.mirror.LastRecordTimestamp(ctx)
if err != nil {
return respond.InternalServerError(err.Error())
}
delay := time.Since(ts)
if delay > s.MaxDelay { if delay > s.MaxDelay {
updateMetrics(http.StatusServiceUnavailable) updateMetrics(http.StatusServiceUnavailable)
return respond.ServiceUnavailable(fmt.Sprintf("mirror is %s behind", delay)) return respond.ServiceUnavailable(fmt.Sprintf("mirror is %s behind", delay))
@ -75,7 +79,7 @@ func (s *Server) serve(ctx context.Context, req *http.Request) convreq.HttpRespo
requestedDid := strings.ToLower(strings.TrimPrefix(req.URL.Path, "/")) requestedDid := strings.ToLower(strings.TrimPrefix(req.URL.Path, "/"))
var entry PLCLogEntry var entry PLCLogEntry
err := s.db.Model(&entry).Where("did = ? AND (NOT nullified)", requestedDid).Order("plc_timestamp desc").Limit(1).Take(&entry).Error err = s.db.Model(&entry).Where("did = ? AND (NOT nullified)", requestedDid).Order("plc_timestamp desc").Limit(1).Take(&entry).Error
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
updateMetrics(http.StatusNotFound) updateMetrics(http.StatusNotFound)
return respond.NotFound("unknown DID") return respond.NotFound("unknown DID")