service/cleanup: Replace use of ctxlogrus with injected logger

The ctxlogrus package is going away with the replacement being log
fields extracted from the context via `log.DebugContext()` et al.
Refactor the code to stop using ctxlogrus by injecting a logger and
using the new context-based logging methods.

1 files changed, 4 insertions, 3 deletions

diff --git a/internal/gitaly/service/cleanup/cleaner.go b/internal/gitaly/service/cleanup/cleaner.go
index 81ae71a29..574933f7f 100644
--- a/internal/gitaly/service/cleanup/cleaner.go
+++ b/internal/gitaly/service/cleanup/cleaner.go
@@ -24,6 +24,7 @@ type forEachFunc func(ctx context.Context, oldOID, newOID string, isInternalRef
 type cleaner struct {
 	ctx     context.Context
 	forEach forEachFunc
+	logger  log.Logger
 
 	// Map of SHA -> reference names
 	table map[string][]git.ReferenceName
@@ -42,7 +43,7 @@ func newCleaner(ctx context.Context, logger log.Logger, repo git.RepositoryExecu
 		return nil, err
 	}
 
-	return &cleaner{ctx: ctx, table: table, repo: repo, forEach: forEach}, nil
+	return &cleaner{ctx: ctx, logger: logger, table: table, repo: repo, forEach: forEach}, nil
 }
 
 // applyObjectMap processes an object map file generated by git filter-repo, or
@@ -119,10 +120,10 @@ func (c *cleaner) processEntry(ctx context.Context, updater *updateref.Updater,
 		return nil
 	}
 
-	log.FromContext(ctx).WithFields(log.Fields{
+	c.logger.WithFields(log.Fields{
 		"sha":  oldSHA,
 		"refs": refs,
-	}).Info("removing internal references")
+	}).InfoContext(ctx, "removing internal references")
 
 	// Remove the internal refs pointing to oldSHA
 	for _, ref := range refs {