apply fixes from rs/zerolog#555 (comment), looks like race conditions…

… gone away, need pull and resolve conflicts from master
Altinity · Aug 12, 2023 · 98245c3 · 98245c3
1 parent eea4f62
commit 98245c3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/pkg/clickhouse/clickhouse.go b/pkg/clickhouse/clickhouse.go
@@ -908,16 +908,14 @@ func (ch *ClickHouse) SelectSingleRowNoCtx(dest interface{}, query string, args
 }
 
 func (ch *ClickHouse) LogQuery(query string, args ...interface{}) string {
-	var logF *zerolog.Event
+	level := zerolog.InfoLevel
 	if !ch.Config.LogSQLQueries {
-		logF = log.Debug()
-	} else {
-		logF = log.Info()
+		level = zerolog.DebugLevel
 	}
 	if len(args) > 0 {
-		logF.Msg(strings.NewReplacer("\n", " ", "\r", " ", "\t", " ").Replace(fmt.Sprintf("%s with args %v", query, args)))
+		log.WithLevel(level).Msgf(strings.NewReplacer("\n", " ", "\r", " ", "\t", " ").Replace(fmt.Sprintf("%s with args %v", query, args)))
 	} else {
-		logF.Msg(strings.NewReplacer("\n", " ", "\r", " ", "\t", " ").Replace(query))
+		log.WithLevel(level).Msg(strings.NewReplacer("\n", " ", "\r", " ", "\t", " ").Replace(query))
 	}
 	return query
 }