diff options
Diffstat (limited to 'internal/streamcache')
| -rw-r--r-- | internal/streamcache/cache.go | 8 | ||||
| -rw-r--r-- | internal/streamcache/filestore.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/streamcache/cache.go b/internal/streamcache/cache.go index be16f923a..ad365c2f6 100644 --- a/internal/streamcache/cache.go +++ b/internal/streamcache/cache.go @@ -35,10 +35,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v16/internal/log" ) var ( @@ -132,7 +132,7 @@ type cache struct { createFile func() (namedWriteCloser, error) stop chan struct{} stopOnce sync.Once - logger logrus.FieldLogger + logger log.Logger dir string sleepLoop *dontpanic.Forever @@ -142,7 +142,7 @@ type cache struct { } // New returns a new cache instance. -func New(cfg config.StreamCacheConfig, logger logrus.FieldLogger) Cache { +func New(cfg config.StreamCacheConfig, logger log.Logger) Cache { if cfg.Enabled { packObjectsCacheEnabled.WithLabelValues( cfg.Dir, @@ -165,7 +165,7 @@ func newCacheWithSleep( maxAge time.Duration, filestoreSleep func(time.Duration) <-chan time.Time, cleanSleep func(time.Duration) <-chan time.Time, - logger logrus.FieldLogger, + logger log.Logger, ) *cache { fs := newFilestore(dir, maxAge, filestoreSleep, logger) diff --git a/internal/streamcache/filestore.go b/internal/streamcache/filestore.go index bf9b1b318..4d01e377e 100644 --- a/internal/streamcache/filestore.go +++ b/internal/streamcache/filestore.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v16/internal/log" ) var ( @@ -60,7 +60,7 @@ type filestore struct { sleepLoop *dontpanic.Forever } -func newFilestore(dir string, maxAge time.Duration, sleep func(time.Duration) <-chan time.Time, logger logrus.FieldLogger) *filestore { +func newFilestore(dir string, maxAge time.Duration, sleep func(time.Duration) <-chan time.Time, logger log.Logger) *filestore { fs := &filestore{ dir: dir, maxAge: maxAge, |