From 8ae61d4a270aab81696fbf8fe31fdc5551bfd4e3 Mon Sep 17 00:00:00 2001 From: xuu Date: Mon, 24 Mar 2025 17:01:50 -0600 Subject: [PATCH] chore: fix queue sort, add feed temp --- http.go | 4 ++-- refresh-loop.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/http.go b/http.go index b121bd8..c588eda 100644 --- a/http.go +++ b/http.go @@ -153,10 +153,10 @@ func httpServer(c *console, app *appState) error { http.HandleFunc("/queue", func(w http.ResponseWriter, r *http.Request) { lis := slices.Collect(app.queue.Iter()) sort.Slice(lis, func(i, j int) bool { - return lis[i].LastScanOn.Time.Before(lis[j].LastScanOn.Time) + return lis[i].NextScanOn.Time.Before(lis[j].LastScanOn.Time) }) for _, feed := range lis { - fmt.Fprintln(w, feed.State, feed.LastScanOn.Time.Format(time.RFC3339), feed.Nick, feed.URI) + fmt.Fprintln(w, feed.State, feed.NextScanOn.Time.Format(time.RFC3339), feed.Nick, feed.URI) } }) diff --git a/refresh-loop.go b/refresh-loop.go index c9d4b25..e1f0b99 100644 --- a/refresh-loop.go +++ b/refresh-loop.go @@ -91,12 +91,14 @@ func feedRefreshProcessor(c *console, app *appState) error { continue } - + span.AddEvent( + "till next", + trace.WithAttributes(attribute.String("time", until.String()))) sleeping_time.Add(ctx, until.Milliseconds()) select { case <-ctx.Done(): return nil - case t := <-time.After(time.Until(f.NextScanOn.Time)): + case t := <-time.After(until): span.AddEvent("fetch", trace.WithAttributes( attribute.Int("size", int(queue.count)), attribute.String("uri", f.URI),