Unify subscription calls.

[kraftakt.git] / gfitsync.go

diff --git a/gfitsync.go b/gfitsync.go
index eb3c953..f913134 100644 (file)
--- a/gfitsync.go
+++ b/gfitsync.go
@@ -126,8 +126,11 @@ func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ
                return err
        }
 
-       if err := c.Subscribe(ctx, "activities"); err != nil {
-               return fmt.Errorf("c.Subscribe() = %v", err)
+       for _, collection := range []string{"activities", "sleep"} {
+               if err := c.Subscribe(ctx, collection); err != nil {
+                       return fmt.Errorf("c.Subscribe(%q) = %v", collection, err)
+               }
+               log.Infof(ctx, "Successfully subscribed to %q", collection)
        }
 
        redirectURL := r.URL
@@ -292,6 +295,8 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 
        wg.Add(1)
        go func() {
+               defer wg.Done()
+
                var distanceMeters float64
                for _, d := range summary.Summary.Distances {
                        if d.Activity != "total" {
@@ -302,8 +307,8 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
                }
                if err := gfitClient.SetDistance(ctx, distanceMeters, tm); err != nil {
                        errs = append(errs, fmt.Errorf("gfitClient.SetDistance(%d) = %v", distanceMeters, err))
+                       return
                }
-               wg.Done()
        }()
 
        wg.Add(1)