htmxhandler use main logger instance of new instance
- commit
- 8b1a07aeaa2ff91f5adc3279003acfc5f8d31315
- author
- bnema · · 2023-09-03 21:00 UTC
- committer
- bnema · · 2023-09-03 16:09 UTC
- parent
- 1de5944
- signature
- unsigned
3 files · +9 -3
M .gitignore +3 -1
| @@ -1,3 +1,5 @@ | |||
| 1 | 1 | .env | |
| 2 | 2 | node_modules/ | |
| 3 | - | tmp/⏎̸ | |
| 3 | + | tmp/ | |
| 4 | + | logs/ | |
| 5 | + | *.log⏎̸ | |
| @@ -1,3 +1,5 @@ | |||||
| 1 | .env | 1 | .env | ||
| 2 | node_modules/ | 2 | node_modules/ | ||
| 3 | - | tmp/⏎̸ | 3 | + | tmp/ |
| 4 | + | logs/ | |||
| 5 | + | *.log⏎̸ | |||
M internal/http/handlers/htmx.go +5 -2
| @@ -10,8 +10,11 @@ import ( | |||
| 10 | 10 | ) | |
| 11 | 11 | ||
| 12 | 12 | func HTMXHandler(c echo.Context) error { | |
| 13 | - | // Get the logger instance | |
| 14 | - | logger := utils.NewLogger() | |
| 13 | + | logger, ok := c.Get("logger").(*utils.Logger) | |
| 14 | + | if !ok { | |
| 15 | + | logger.Error().Msg("Failed to get logger from context") | |
| 16 | + | return c.String(http.StatusInternalServerError, "Failed to get logger from context") | |
| 17 | + | } | |
| 15 | 18 | // Detect and extract HTMX data from the request | |
| 16 | 19 | htmxRequest, err := htmx.GetRequest(c) | |
| 17 | 20 | if err != nil { | |
| @@ -10,8 +10,11 @@ import ( | |||||
| 10 | ) | 10 | ) | ||
| 11 | 11 | ||||
| 12 | func HTMXHandler(c echo.Context) error { | 12 | func HTMXHandler(c echo.Context) error { | ||
| 13 | - | // Get the logger instance | 13 | + | logger, ok := c.Get("logger").(*utils.Logger) |
| 14 | - | logger := utils.NewLogger() | 14 | + | if !ok { |
| 15 | + | logger.Error().Msg("Failed to get logger from context") | |||
| 16 | + | return c.String(http.StatusInternalServerError, "Failed to get logger from context") | |||
| 17 | + | } | |||
| 15 | // Detect and extract HTMX data from the request | 18 | // Detect and extract HTMX data from the request | ||
| 16 | htmxRequest, err := htmx.GetRequest(c) | 19 | htmxRequest, err := htmx.GetRequest(c) | ||
| 17 | if err != nil { | 20 | if err != nil { | ||
M logs/app.log +1 -0
| @@ -47,3 +47,4 @@ | |||
| 47 | 47 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Graceful shutdown initiated"} | |
| 48 | 48 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Server will shutdown in 5 seconds press ENTER to cancel"} | |
| 49 | 49 | {"level":"info","time":"2023-09-04T14:51:15+02:00","message":"Server shutdown"} | |
| 50 | + | {"level":"info","time":"2023-09-04T17:18:16+02:00","message":"Server is listening on port 1323"} | |
| @@ -47,3 +47,4 @@ | |||||
| 47 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Graceful shutdown initiated"} | 47 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Graceful shutdown initiated"} | ||
| 48 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Server will shutdown in 5 seconds press ENTER to cancel"} | 48 | {"level":"warn","time":"2023-09-04T14:51:10+02:00","message":"Server will shutdown in 5 seconds press ENTER to cancel"} | ||
| 49 | {"level":"info","time":"2023-09-04T14:51:15+02:00","message":"Server shutdown"} | 49 | {"level":"info","time":"2023-09-04T14:51:15+02:00","message":"Server shutdown"} | ||
| 50 | + | {"level":"info","time":"2023-09-04T17:18:16+02:00","message":"Server is listening on port 1323"} | |||