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 · 0a8b726 · 0a8b726
1 parent c20eeb0
commit 0a8b726
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/clickhouse-backup/main.go b/cmd/clickhouse-backup/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/rs/zerolog/diode"
 	stdlog "log"
 	"os"
 	"time"
@@ -13,6 +12,7 @@ import (
 	"github.com/Altinity/clickhouse-backup/pkg/server"
 	"github.com/Altinity/clickhouse-backup/pkg/status"
 	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/diode"
 	"github.com/rs/zerolog/log"
 	"github.com/rs/zerolog/pkgerrors"
 	"github.com/urfave/cli"

diff --git a/pkg/backup/download.go b/pkg/backup/download.go
@@ -191,8 +191,8 @@ func (b *Backuper) Download(backupName string, tablePattern string, partitions [
 		idx := i
 		tableTitle := t
 		metadataGroup.Go(func() error {
-			tableLogger := logger.With().Str("table_metadata", fmt.Sprintf("%s.%s", tableTitle.Database, tableTitle.Table)).Logger()
 			defer downloadSemaphore.Release(1)
+			tableLogger := logger.With().Str("table_metadata", fmt.Sprintf("%s.%s", tableTitle.Database, tableTitle.Table)).Logger()
 			downloadedMetadata, size, err := b.downloadTableMetadata(metadataCtx, backupName, disks, tableLogger, tableTitle, schemaOnly, partitions)
 			if err != nil {
 				return err