X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gfitsync.go;h=3bd416f578fe73e24503faa49340fd6565c8b4d7;hb=1830c80233b16dea15b5d07ddc6156ac1088887d;hp=65cbfa6692d7683b99b20fd23ef010bdf6f06d57;hpb=246b00f84f83100342ee8d57f1faf17ac5d0dd41;p=kraftakt.git diff --git a/gfitsync.go b/gfitsync.go index 65cbfa6..3bd416f 100644 --- a/gfitsync.go +++ b/gfitsync.go @@ -229,32 +229,51 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error { return err } - profile, err := fitbitClient.Profile(ctx) - if err != nil { - return err + var ( + wg = &sync.WaitGroup{} + errs appengine.MultiError + summary *fitbit.ActivitySummary + profile *fitbit.Profile + ) + + wg.Add(1) + go func() { + var err error + summary, err = fitbitClient.ActivitySummary(ctx, s.Date) + if err != nil { + errs = append(errs, fmt.Errorf("fitbitClient.ActivitySummary(%q) = %v", s.Date, err)) + } + wg.Done() + }() + + wg.Add(1) + go func() { + var err error + profile, err = fitbitClient.Profile(ctx) + if err != nil { + errs = append(errs, fmt.Errorf("fitbitClient.Profile(%q) = %v", s.Date, err)) + } + wg.Done() + }() + + wg.Wait() + if len(errs) != 0 { + return errs } - log.Debugf(ctx, "profile = %+v", profile) tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone) if err != nil { return err } - summary, err := fitbitClient.ActivitySummary(ctx, tm) - if err != nil { - return err - } log.Debugf(ctx, "%s (%s) took %d steps on %s", - profile.Name, u.Email, summary.Summary.Steps, s.Date) + profile.Name, u.Email, summary.Summary.Steps, tm) gfitClient, err := gfit.NewClient(ctx, u) if err != nil { return err } - var errs appengine.MultiError - wg := &sync.WaitGroup{} - wg.Add(1) go func() { if err := gfitClient.SetSteps(ctx, summary.Summary.Steps, tm); err != nil { @@ -296,5 +315,9 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error { }() wg.Wait() - return errs + + if len(errs) != 0 { + return errs + } + return nil }