iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

move logger to http package.

Browse Source
This commit is contained in:
Miroslav Šedivý 2020-10-29 22:12:33 +01:00
parent 3c5c01f475
commit fc3ee13f65
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/http/http.go
View File

@ -12,7 +12,6 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"demodesk/neko/internal/http/endpoint" "demodesk/neko/internal/http/endpoint"
customMiddleware "demodesk/neko/internal/http/middleware"
"demodesk/neko/internal/types" "demodesk/neko/internal/types"
"demodesk/neko/internal/types/config" "demodesk/neko/internal/types/config"
) )
@ -30,7 +29,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server {
router := chi.NewRouter() router := chi.NewRouter()
router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.Recoverer) // Recover from panics without crashing server
router.Use(middleware.RequestID) // Create a request ID for each request router.Use(middleware.RequestID) // Create a request ID for each request
router.Use(customMiddleware.Logger) // Log API request calls using custom logger function router.Use(Logger) // Log API request calls using custom logger function
router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { router.Get("/ws", func(w http.ResponseWriter, r *http.Request) {
if webSocketHandler.Upgrade(w, r) != nil { if webSocketHandler.Upgrade(w, r) != nil {
@ -51,7 +50,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server {
router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error { router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error {
return &endpoint.HandlerError{ return &endpoint.HandlerError{
Status: http.StatusNotFound, Status: http.StatusNotFound,
Message: fmt.Sprintf("file '%s' is not found", r.RequestURI), Message: fmt.Sprintf("Endpoint '%s' was not found.", r.RequestURI),
} }
})) }))

2
internal/http/middleware/logger.go → internal/http/logger.go
View File

@ -1,4 +1,4 @@
package middleware package http
import ( import (
"fmt" "fmt"