Skip to content

Commit 2aafa42

Browse files
authored
Merge pull request #364 from databacker/fix-log-levels
when creating logger from existing one WithFields, ensure applying existing log levels
2 parents 9091293 + d224d59 commit 2aafa42

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

pkg/core/dump.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func (e *Executor) Dump(opts DumpOptions) (DumpResults, error) {
3030
maxAllowedPacket := opts.MaxAllowedPacket
3131
filenamePattern := opts.FilenamePattern
3232
logger := e.Logger.WithField("run", opts.Run.String())
33+
logger.Level = e.Logger.Level
3334

3435
now := time.Now()
3536
results.Time = now

pkg/core/prune.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[
1515
// Prune prune older backups
1616
func (e *Executor) Prune(opts PruneOptions) error {
1717
logger := e.Logger.WithField("run", opts.Run.String())
18+
logger.Level = e.Logger.Level
1819
logger.Info("beginning prune")
1920
var (
2021
candidates []string

pkg/core/restore.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const (
1919
// Restore restore a specific backup into the database
2020
func (e *Executor) Restore(opts RestoreOptions) error {
2121
logger := e.Logger.WithField("run", opts.Run.String())
22+
logger.Level = e.Logger.Level
2223

2324
logger.Info("beginning restore")
2425
// execute pre-restore scripts if any

pkg/log/telemetry.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (t *telemetry) Fire(entry *log.Entry) error {
7474
defer func() { ch <- len(entries) }()
7575
}
7676
l := entry.Logger.WithField(sourceField, sourceTelemetry)
77+
l.Level = entry.Logger.Level
7778
remoteEntries := make([]LogEntry, len(entries))
7879
for i, entry := range entries {
7980
// send the structured data to the telemetry endpoint

0 commit comments

Comments
 (0)