v3: fix logger benchmarks

gofiber · Sep 6, 2022 · 81d89ee · 81d89ee · ReneWerner87 · Sep 6, 2022
1 parent 90c1c4c
commit 81d89ee
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/middleware/logger/README.md b/middleware/logger/README.md
@@ -95,7 +95,7 @@ func main() {
 
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 
-	app.Use(logger.New(logger.Config{LoggerFunc: func(c fiber.Ctx, data logger.LoggerData, cfg logger.Config) error {
+	app.Use(logger.New(logger.Config{LoggerFunc: func(c fiber.Ctx, data *logger.LoggerData, cfg logger.Config) error {
 		log.Info().
 			Str("path", c.Path()).
 			Str("method", c.Method()).
@@ -158,7 +158,7 @@ type Config struct {
 	// If you don't define anything for this field, it'll use classical logger of Fiber.
 	//
 	// Optional. Default: defaultLogger
-	LoggerFunc func(c fiber.Ctx, data LoggerData, cfg Config) error
+	LoggerFunc func(c fiber.Ctx, data *LoggerData, cfg Config) error
 }
 ```
 

diff --git a/middleware/logger/config.go b/middleware/logger/config.go
@@ -51,7 +51,7 @@ type Config struct {
 	// If you don't define anything for this field, it'll use default logger of Fiber.
 	//
 	// Optional. Default: defaultLogger
-	LoggerFunc func(c fiber.Ctx, data LoggerData, cfg Config) error
+	LoggerFunc func(c fiber.Ctx, data *LoggerData, cfg Config) error
 
 	enableColors     bool
 	enableLatency    bool

diff --git a/middleware/logger/default_logger.go b/middleware/logger/default_logger.go
@@ -28,11 +28,10 @@ type LoggerData struct {
 }
 
 var tmpl *fasttemplate.Template
+var mu sync.Mutex
 
 // default logger for fiber
-func defaultLogger(c fiber.Ctx, data LoggerData, cfg Config) error {
-	var mu sync.Mutex
-
+func defaultLogger(c fiber.Ctx, data *LoggerData, cfg Config) error {
 	// Alias colors
 	colors := c.App().Config().ColorScheme
 

diff --git a/middleware/logger/logger.go b/middleware/logger/logger.go
@@ -99,6 +99,13 @@ func New(config ...Config) fiber.Handler {
 	// Before handling func
 	cfg.BeforeHandlerFunc(cfg)
 
+	// Logger data
+	data := &LoggerData{
+		Pid:           pid,
+		ErrPaddingStr: errPaddingStr,
+		Timestamp:     timestamp,
+	}
+
 	// Return new handler
 	return func(c fiber.Ctx) (err error) {
 		// Don't execute middleware if Next returns true
@@ -144,15 +151,12 @@ func New(config ...Config) fiber.Handler {
 			stop = time.Now()
 		}
 
-		// Logger instance
-		if err = cfg.LoggerFunc(c, LoggerData{
-			Pid:           pid,
-			ErrPaddingStr: errPaddingStr,
-			ChainErr:      chainErr,
-			Start:         start,
-			Stop:          stop,
-			Timestamp:     timestamp,
-		}, cfg); err != nil {
+		// Logger instance & update some logger data fields
+		data.ChainErr = chainErr
+		data.Start = start
+		data.Stop = stop
+
+		if err = cfg.LoggerFunc(c, data, cfg); err != nil {
 			return err
 		}