refactor: small improvements and clean up (#3423)

* refactor: replace custom map functions with slice.Map

* refactor: extract StringerValue function

* refactor: removed unnecessary if

* chore: removed invalid comment

* refactor: replace more map functions

* chore: fix FFmpeg typo

log/formatters.go

@@ -1,7 +1,9 @@
 package log
 
 import (
+	"fmt"
 	"io"
+	"reflect"
 	"strings"
 	"time"
 )
@@ -24,6 +26,14 @@ func ShortDur(d time.Duration) string {
 	return strings.TrimSuffix(s, "0m")
 }
 
+func StringerValue(s fmt.Stringer) string {
+	v := reflect.ValueOf(s)
+	if v.Kind() == reflect.Pointer && v.IsNil() {
+		return "nil"
+	}
+	return s.String()
+}
+
 func CRLFWriter(w io.Writer) io.Writer {
 	return &crlfWriter{w: w}
 }

log/formatters_test.go

@@ -28,6 +28,16 @@ var _ = DescribeTable("ShortDur",
 	Entry("4h2m", 4*time.Hour+2*time.Minute+5*time.Second+200*time.Millisecond, "4h2m"),
 )
 
+var _ = Describe("StringerValue", func() {
+	It("should return the string representation of a fmt.Stringer", func() {
+		Expect(log.StringerValue(time.Second)).To(Equal("1s"))
+	})
+	It("should return 'nil' for a nil fmt.Stringer", func() {
+		v := (*time.Time)(nil)
+		Expect(log.StringerValue(v)).To(Equal("nil"))
+	})
+})
+
 var _ = Describe("CRLFWriter", func() {
 	var (
 		buffer *bytes.Buffer

log/log.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"reflect"
 	"runtime"
 	"sort"
 	"strings"
@@ -277,12 +276,7 @@ func addFields(logger *logrus.Entry, keyValuePairs []interface{}) *logrus.Entry
 				case time.Duration:
 					logger = logger.WithField(name, ShortDur(v))
 				case fmt.Stringer:
-					vOf := reflect.ValueOf(v)
-					if vOf.Kind() == reflect.Pointer && vOf.IsNil() {
-						logger = logger.WithField(name, "nil")
-					} else {
-						logger = logger.WithField(name, v.String())
-					}
+					logger = logger.WithField(name, StringerValue(v))
 				default:
 					logger = logger.WithField(name, v)
 				}