rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plumb a custom logger through the core rather than only in Restore (#481)

Browse Source
This commit is contained in:
Evan Phoenix
2023-05-19 19:34:50 -07:00
committed by GitHub
parent ad3d65382f
commit 18760d2a7a
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
db.go
View File

@@ -94,6 +94,9 @@ type DB struct {
// List of replicas for the database.
// Must be set before calling Open().
Replicas []*Replica
// Where to send log messages, defaults to log.Default()
Logger *log.Logger
}
// NewDB returns a new instance of DB for a given path.
@@ -106,6 +109,8 @@ func NewDB(path string) *DB {
MaxCheckpointPageN: DefaultMaxCheckpointPageN,
CheckpointInterval: DefaultCheckpointInterval,
MonitorInterval: DefaultMonitorInterval,
Logger: log.Default(),
}
db.dbSizeGauge = dbSizeGaugeVec.WithLabelValues(db.path)
@@ -447,7 +452,7 @@ func (db *DB) init() (err error) {
// If we have an existing shadow WAL, ensure the headers match.
if err := db.verifyHeadersMatch(); err != nil {
log.Printf("%s: init: cannot determine last wal position, clearing generation; %s", db.path, err)
db.Logger.Printf("%s: init: cannot determine last wal position, clearing generation; %s", db.path, err)
if err := os.Remove(db.GenerationNamePath()); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("remove generation name: %w", err)
}
@@ -726,7 +731,7 @@ func (db *DB) Sync(ctx context.Context) (err error) {
if info.generation, err = db.createGeneration(); err != nil {
return fmt.Errorf("create generation: %w", err)
}
log.Printf("%s: sync: new generation %q, %s", db.path, info.generation, info.reason)
db.Logger.Printf("%s: sync: new generation %q, %s", db.path, info.generation, info.reason)
// Clear shadow wal info.
info.shadowWALPath = db.ShadowWALPath(info.generation, 0)
@@ -1365,7 +1370,7 @@ func (db *DB) monitor() {
// Sync the database to the shadow WAL.
if err := db.Sync(db.ctx); err != nil && !errors.Is(err, context.Canceled) {
log.Printf("%s: sync error: %s", db.path, err)
db.Logger.Printf("%s: sync error: %s", db.path, err)
}
}
}