diff --git a/backend/server/admin_router.go b/backend/server/admin_router.go index 8270fc10..93076385 100644 --- a/backend/server/admin_router.go +++ b/backend/server/admin_router.go @@ -6,6 +6,7 @@ import ( "github.com/teamhanko/hanko/dto" handler "github.com/teamhanko/hanko/handler" "github.com/teamhanko/hanko/persistence" + hankoMiddleware "github.com/teamhanko/hanko/server/middleware" ) func NewPrivateRouter(persister persistence.Persister) *echo.Echo { @@ -13,12 +14,7 @@ func NewPrivateRouter(persister persistence.Persister) *echo.Echo { e.HideBanner = true e.Use(middleware.RequestID()) - e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ - Format: `{"time":"${time_rfc3339_nano}","time_unix":"${time_unix}","id":"${id}","remote_ip":"${remote_ip}",` + - `"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` + - `"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` + - `,"bytes_in":${bytes_in},"bytes_out":${bytes_out}},"referer":"${referer}"` + "\n", - })) + e.Use(hankoMiddleware.GetLoggerMiddleware()) e.Validator = dto.NewCustomValidator() diff --git a/backend/server/middleware/logger.go b/backend/server/middleware/logger.go new file mode 100644 index 00000000..2a11d860 --- /dev/null +++ b/backend/server/middleware/logger.go @@ -0,0 +1,15 @@ +package middleware + +import ( + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" +) + +func GetLoggerMiddleware() echo.MiddlewareFunc { + return middleware.LoggerWithConfig(middleware.LoggerConfig{ + Format: `{"time":"${time_rfc3339_nano}","time_unix":"${time_unix}","id":"${id}","remote_ip":"${remote_ip}",` + + `"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` + + `"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` + + `,"bytes_in":${bytes_in},"bytes_out":${bytes_out}},"referer":"${referer}"` + "\n", + }) +} diff --git a/backend/server/public_router.go b/backend/server/public_router.go index 803142d1..97915d2f 100644 --- a/backend/server/public_router.go +++ b/backend/server/public_router.go @@ -19,12 +19,7 @@ func NewPublicRouter(cfg *config.Config, persister persistence.Persister) *echo. e.HideBanner = true e.Use(middleware.RequestID()) - e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ - Format: `{"time":"${time_rfc3339_nano}","time_unix":"${time_unix}","id":"${id}","remote_ip":"${remote_ip}",` + - `"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` + - `"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` + - `,"bytes_in":${bytes_in},"bytes_out":${bytes_out}},"referer":"${referer}"` + "\n", - })) + e.Use(hankoMiddleware.GetLoggerMiddleware()) if cfg.Server.Public.Cors.Enabled { e.Use(middleware.CORSWithConfig(middleware.CORSConfig{