From 825336d0e488f935da74b52bf5e9d2787690df8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Ga=C4=87e=C5=A1a?= Date: Wed, 25 Jan 2023 14:06:48 +0100 Subject: [PATCH] Added missing context in some of the log calls (#250) --- internal/api/controller/pullreq/merge.go | 2 +- internal/api/controller/pullreq/pr_state.go | 2 +- internal/api/controller/pullreq/pr_update.go | 2 +- internal/api/controller/pullreq/review_submit.go | 2 +- internal/store/database/pullreq.go | 4 ++-- internal/store/database/pullreq_activity.go | 4 ++-- internal/store/database/pullreq_reviewers.go | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/api/controller/pullreq/merge.go b/internal/api/controller/pullreq/merge.go index 7fbadc2f8..d32a7e156 100644 --- a/internal/api/controller/pullreq/merge.go +++ b/internal/api/controller/pullreq/merge.go @@ -131,7 +131,7 @@ func (c *Controller) Merge( err = c.writeActivity(ctx, pr, activity) if err != nil { - log.Err(err).Msg("failed to write pull req activity") + log.Ctx(ctx).Err(err).Msg("failed to write pull req activity") } c.eventReporter.Merged(ctx, &pullreqevents.MergedPayload{ diff --git a/internal/api/controller/pullreq/pr_state.go b/internal/api/controller/pullreq/pr_state.go index f252a1f8b..53a7ba3d4 100644 --- a/internal/api/controller/pullreq/pr_state.go +++ b/internal/api/controller/pullreq/pr_state.go @@ -124,7 +124,7 @@ func (c *Controller) State(ctx context.Context, err = c.writeActivity(ctx, pr, getStateActivity(session, pr, in)) if err != nil { // non-critical error - log.Err(err).Msg("failed to write pull req activity") + log.Ctx(ctx).Err(err).Msg("failed to write pull req activity") } c.eventReporter.StateChange(ctx, event) diff --git a/internal/api/controller/pullreq/pr_update.go b/internal/api/controller/pullreq/pr_update.go index c971ae89b..24ea8abe4 100644 --- a/internal/api/controller/pullreq/pr_update.go +++ b/internal/api/controller/pullreq/pr_update.go @@ -102,7 +102,7 @@ func (c *Controller) Update(ctx context.Context, err = c.writeActivity(ctx, pr, activity) if err != nil { // non-critical error - log.Err(err).Msg("failed to write pull req activity") + log.Ctx(ctx).Err(err).Msg("failed to write pull req activity") } } diff --git a/internal/api/controller/pullreq/review_submit.go b/internal/api/controller/pullreq/review_submit.go index 932550be2..500d1772d 100644 --- a/internal/api/controller/pullreq/review_submit.go +++ b/internal/api/controller/pullreq/review_submit.go @@ -113,7 +113,7 @@ func (c *Controller) ReviewSubmit( err = c.writeActivity(ctx, pr, act) if err != nil { // non-critical error - log.Err(err).Msg("failed to generate pull request activity entry for submitting review") + log.Ctx(ctx).Err(err).Msg("failed to generate pull request activity entry for submitting review") } return review, err diff --git a/internal/store/database/pullreq.go b/internal/store/database/pullreq.go index ae836d30d..c21c56a5a 100644 --- a/internal/store/database/pullreq.go +++ b/internal/store/database/pullreq.go @@ -489,7 +489,7 @@ func (s *PullReqStore) mapPullReq(ctx context.Context, pr *pullReq) *types.PullR author, err = s.pCache.Get(ctx, pr.CreatedBy) if err != nil { - log.Err(err).Msg("failed to load PR author") + log.Ctx(ctx).Err(err).Msg("failed to load PR author") } if author != nil { m.Author = *author @@ -498,7 +498,7 @@ func (s *PullReqStore) mapPullReq(ctx context.Context, pr *pullReq) *types.PullR if pr.MergedBy.Valid { merger, err = s.pCache.Get(ctx, pr.MergedBy.Int64) if err != nil { - log.Err(err).Msg("failed to load PR merger") + log.Ctx(ctx).Err(err).Msg("failed to load PR merger") } m.Merger = merger } diff --git a/internal/store/database/pullreq_activity.go b/internal/store/database/pullreq_activity.go index 6f627c66c..97ebc5f35 100644 --- a/internal/store/database/pullreq_activity.go +++ b/internal/store/database/pullreq_activity.go @@ -411,7 +411,7 @@ func (s *PullReqActivityStore) mapPullReqActivity(ctx context.Context, act *pull author, err = s.pCache.Get(ctx, act.CreatedBy) if err != nil { - log.Err(err).Msg("failed to load PR activity author") + log.Ctx(ctx).Err(err).Msg("failed to load PR activity author") } if author != nil { m.Author = *author @@ -420,7 +420,7 @@ func (s *PullReqActivityStore) mapPullReqActivity(ctx context.Context, act *pull if act.ResolvedBy.Valid { resolver, err = s.pCache.Get(ctx, act.ResolvedBy.Int64) if err != nil { - log.Err(err).Msg("failed to load PR activity resolver") + log.Ctx(ctx).Err(err).Msg("failed to load PR activity resolver") } m.Resolver = resolver } diff --git a/internal/store/database/pullreq_reviewers.go b/internal/store/database/pullreq_reviewers.go index ad17ab537..59c903cf5 100644 --- a/internal/store/database/pullreq_reviewers.go +++ b/internal/store/database/pullreq_reviewers.go @@ -241,7 +241,7 @@ func (s *PullReqReviewerStore) mapPullReqReviewer(ctx context.Context, v *pullRe addedBy, err := s.pCache.Get(ctx, v.CreatedBy) if err != nil { - log.Err(err).Msg("failed to load PR reviewer addedBy") + log.Ctx(ctx).Err(err).Msg("failed to load PR reviewer addedBy") } if addedBy != nil { m.AddedBy = *addedBy @@ -249,7 +249,7 @@ func (s *PullReqReviewerStore) mapPullReqReviewer(ctx context.Context, v *pullRe reviewer, err := s.pCache.Get(ctx, v.PrincipalID) if err != nil { - log.Err(err).Msg("failed to load PR reviewer principal") + log.Ctx(ctx).Err(err).Msg("failed to load PR reviewer principal") } if reviewer != nil { m.Reviewer = *reviewer