Fix panic when logging media name

doingodswork · doingodswork · commit fb7a038fd412 · 2020-08-27T21:42:03.000+02:00
diff --git a/middleware.go b/middleware.go
@@ -155,11 +155,13 @@ func createLoggingMiddleware(logger *zap.Logger, logIPs, logUserAgent, logMediaN
 			}
 		}
 
+		var zapFields []zap.Field
+		// TODO: To increase performance, don't create a new slice for every request. Use sync.Pool.
 		if logMediaName && isStream {
-			zapFieldCount++
+			zapFields = make([]zap.Field, zapFieldCount+1)
+		} else {
+			zapFields = make([]zap.Field, zapFieldCount)
 		}
-		// TODO: To increase performance, don't create a new slice for every request. Use sync.Pool.
-		zapFields := make([]zap.Field, zapFieldCount)
 
 		duration := time.Since(start).Milliseconds()
 		durationString := strconv.FormatInt(duration, 10) + "ms"

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,13 @@ func createLoggingMiddleware(logger *zap.Logger, logIPs, logUserAgent, logMediaN`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ var zapFields []zap.Field`
	`159`	`+ // TODO: To increase performance, don't create a new slice for every request. Use sync.Pool.`
`158`	`160`	`if logMediaName && isStream {`
`159`		`- zapFieldCount++`
	`161`	`+ zapFields = make([]zap.Field, zapFieldCount+1)`
	`162`	`+ } else {`
	`163`	`+ zapFields = make([]zap.Field, zapFieldCount)`
`160`	`164`	`}`
`161`		`- // TODO: To increase performance, don't create a new slice for every request. Use sync.Pool.`
`162`		`- zapFields := make([]zap.Field, zapFieldCount)`
`163`	`165`
`164`	`166`	`duration := time.Since(start).Milliseconds()`
`165`	`167`	`durationString := strconv.FormatInt(duration, 10) + "ms"`