faercol/http-boot-server
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Fix logs and services
Some checks failed
continuous-integration/drone Build is failing
Details

Browse source
This commit is contained in:
Melora Hugues 2023-07-24 23:05:50 +02:00
parent 9f39de9bca
commit ad52dca10f
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootserver/controllers/client/client.go
View file

@ -19,9 +19,9 @@ type BootController struct {
l *logrus.Logger
}
func NewBootController(logger *logrus.Logger) *BootController {
func NewBootController(logger *logrus.Logger, service *services.ClientHandlerService) *BootController {
return &BootController{
clientService: services.NewClientHandlerService(),
clientService: service,
l: logger,
}
}

4
bootserver/controllers/client/enroll.go
View file

@ -20,9 +20,9 @@ type EnrollController struct {
l *logrus.Logger
}
func NewEnrollController(l *logrus.Logger) *EnrollController {
func NewEnrollController(l *logrus.Logger, service *services.ClientHandlerService) *EnrollController {
return &EnrollController{
clientService: services.NewClientHandlerService(),
clientService: service,
l: l,
}
}

2
bootserver/middlewares/logger.go
View file

@ -35,5 +35,5 @@ func (lm *LoggerMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
clientIP = "unknown"
}
lm.l.Infof(`%s - [%v] "%s %s %s" %d %d`, clientIP, currentTime, method, route, httpVersion, responseInfo.ReturnCode, responseInfo.ContentLength)
lm.l.Infof(`%s - [%s] "%s %s %s" %d %d`, clientIP, currentTime.Format(time.RFC3339), method, route, httpVersion, responseInfo.ReturnCode, responseInfo.ContentLength)
}

7
bootserver/server/server.go
View file

@ -12,6 +12,7 @@ import (
"git.faercol.me/faercol/http-boot-server/bootserver/config"
"git.faercol.me/faercol/http-boot-server/bootserver/controllers/client"
"git.faercol.me/faercol/http-boot-server/bootserver/middlewares"
"git.faercol.me/faercol/http-boot-server/bootserver/services"
"github.com/sirupsen/logrus"
)
@ -63,10 +64,10 @@ func New(appConf *config.AppConfig, logger *logrus.Logger) (*Server, error) {
default:
panic(fmt.Errorf("unexpected listening mode %v", appConf.ServerMode))
}
service := services.NewClientHandlerService()
controllers := map[string]http.Handler{
client.BootRoute: middlewares.WithLogger(client.NewBootController(logger), logger),
client.EnrollRoute: middlewares.WithLogger(client.NewEnrollController(logger), logger),
client.BootRoute: middlewares.WithLogger(client.NewBootController(logger, service), logger),
client.EnrollRoute: middlewares.WithLogger(client.NewEnrollController(logger, service), logger),
}
m := http.NewServeMux()