fix thread-safe zerolog usage, details rs/zerolog#242 and https://git…

…hub.com/rs/zerolog/blob/master/README.md?plain=1#L431
mskwon · Jun 14, 2023 · 50bce08 · 50bce08
1 parent c2160c5
commit 50bce08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/backup/download.go b/pkg/backup/download.go
@@ -398,6 +398,7 @@ func (b *Backuper) downloadTableMetadata(ctx context.Context, backupName string,
 			b.resumableState.AppendToState(localMetadataFile, written)
 		}
 	}
+	logger = logger.With().Logger()
 	logger.Info().
 		Str("duration", utils.HumanizeDuration(time.Since(start))).
 		Str("size", utils.FormatBytes(size)).

diff --git a/pkg/resumable/state.go b/pkg/resumable/state.go
@@ -105,12 +105,13 @@ func (s *State) IsAlreadyProcessed(path string) (bool, int64) {
 	res := strings.Index(s.currentState, path+":")
 	if res >= 0 {
 		// s.logger is non thread-safe https://github.com/rs/zerolog/issues/242
-		s.logger.Info().Msgf("%s already processed", path)
+		logger := s.logger.With().Logger()
+		logger.Info().Msgf("%s already processed", path)
 		sSize := s.currentState[res : res+strings.Index(s.currentState[res:], "\n")]
 		sSize = sSize[strings.Index(sSize, ":")+1:]
 		size, err = strconv.ParseInt(sSize, 10, 64)
 		if err != nil {
-			s.logger.Warn().Msgf("invalid size %s in upload state: %v", sSize, err)
+			logger.Warn().Msgf("invalid size %s in upload state: %v", sSize, err)
 		}
 	}
 	s.mx.RUnlock()