Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/storage/storagemgr/database.go')
-rw-r--r--internal/gitaly/storage/storagemgr/database.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/internal/gitaly/storage/storagemgr/database.go b/internal/gitaly/storage/storagemgr/database.go
index 24146f44a..526c7eda6 100644
--- a/internal/gitaly/storage/storagemgr/database.go
+++ b/internal/gitaly/storage/storagemgr/database.go
@@ -2,19 +2,28 @@ package storagemgr
import (
"github.com/dgraph-io/badger/v4"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/log"
)
// OpenDatabase opens a new database handle to a database at the given path.
-func OpenDatabase(logger badger.Logger, databasePath string) (*badger.DB, error) {
+func OpenDatabase(logger log.Logger, databasePath string) (*badger.DB, error) {
dbOptions := badger.DefaultOptions(databasePath)
// Enable SyncWrites to ensure all writes are persisted to disk before considering
// them committed.
dbOptions.SyncWrites = true
- dbOptions.Logger = logger
+ dbOptions.Logger = badgerLogger{logger}
return badger.Open(dbOptions)
}
+type badgerLogger struct {
+ log.Logger
+}
+
+func (l badgerLogger) Warningf(msg string, args ...any) {
+ l.Warnf(msg, args...)
+}
+
// databaseAdapter adapts a *badger.DB to the internal database interface used by the hooks in tests.
type databaseAdapter struct{ *badger.DB }