upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #957 from Icinga/icingadb-migrate-database-logger

Browse source 
icingadb-migrate: Logger for Database connections
This commit is contained in:
Alvar 2025-05-27 14:35:42 +00:00 committed by GitHub
commit a64c66f19e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/icingadb-migrate/main.go
View file

@ -20,7 +20,6 @@ import (
_ "github.com/mattn/go-sqlite3"
"github.com/pkg/errors"
"github.com/vbauerster/mpb/v6"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
"math"
"os"
@ -195,17 +194,19 @@ func connectAll(c *Config) (ido, idb *database.DB) {
// connect connects to which DB as cfg specifies. (On non-recoverable errors the whole program exits.)
func connect(which string, cfg *database.Config) *database.DB {
connectLog := log.With("backend", which)
db, err := database.NewDbFromConfig(
cfg,
logging.NewLogger(zap.NewNop().Sugar(), 20*time.Second),
logging.NewLogger(connectLog, 20*time.Second),
database.RetryConnectorCallbacks{},
)
if err != nil {
log.With("backend", which).Fatalf("%+v", errors.Wrap(err, "can't connect to database"))
connectLog.Fatalf("%+v", errors.Wrap(err, "can't connect to database"))
}
if err := db.Ping(); err != nil {
log.With("backend", which).Fatalf("%+v", errors.Wrap(err, "can't connect to database"))
connectLog.Fatalf("%+v", errors.Wrap(err, "can't connect to database"))
}
return db