BUG/MINOR: logs: do not add brackets to logs that do not have any labels

haproxytech · Nov 15, 2023 · 0a82ea7 · 0a82ea7
1 parent 8cd1851
commit 0a82ea7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -73,11 +73,11 @@ func main() {
 		return
 	}
 	if osArgs.JobCheckCRD {
-		logger.Print(IngressControllerInfo)
+		logger.Print(version.IngressControllerInfo)
 		logger.Print(job.IngressControllerCRDUpdater)
-		logger.Infof("HAProxy Ingress Controller CRD Updater %s %s%s", GitTag, GitCommit, GitDirty)
-		logger.Infof("Build from: %s", GitRepo)
-		logger.Infof("Build date: %s\n", GitCommitDate)
+		logger.Infof("HAProxy Ingress Controller CRD Updater %s %s%s", version.GitTag, version.GitCommit, version.GitDirty)
+		logger.Infof("Build from: %s", version.GitRepo)
+		logger.Infof("Build date: %s\n", version.GitCommitDate)
 
 		err := job.CRDRefresh(logger, osArgs)
 		if err != nil {

diff --git a/pkg/utils/logging.go b/pkg/utils/logging.go
@@ -144,11 +144,15 @@ func (l *logger) ResetFields() {
 
 func (l *logger) fieldsAsString() string {
 	var fields strings.Builder
-	fields.WriteString("[")
+	if len(l.fields) > 0 {
+		fields.WriteString("[")
+	}
 	for k, v := range l.fields {
 		fields.WriteString(fmt.Sprintf("%s=%v", k, v))
 	}
-	fields.WriteString("]")
+	if len(l.fields) > 0 {
+		fields.WriteString("]")
+	}
 
 	return fields.String()
 }