From da303b27e0db30a06b93e5451a91c143a3c6b4d1 Mon Sep 17 00:00:00 2001 From: Urko Date: Mon, 3 Apr 2023 19:01:32 +0200 Subject: [PATCH] feat: add crono to rest --- cmd/server/main.go | 6 ++---- internal/api/http/server.go | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 1d9e79a..b9ad9eb 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -42,19 +42,17 @@ func main() { professionalRepo := employee_wi.NewRepo(employeeWICollection) restServer := http. - NewRestServer(cfg). + NewRestServer(cfg, cr). WithProfessionalHandler(services.NewEmployeeWIService(ctx, professionalRepo)) cr.MarkAndRestart("dependencies loaded") + log.Println(cfg) go func() { - cr.Restart() if err = restServer.Start(cfg.ApiPort, ""); err != nil { log.Fatalln("restServer.Start", err) cancel() } - cr.MarkAndRestart("server up") }() - <-ctx.Done() restServer.Shutdown() log.Println("gracefully shutdown") diff --git a/internal/api/http/server.go b/internal/api/http/server.go index 3b5e466..9838dc7 100644 --- a/internal/api/http/server.go +++ b/internal/api/http/server.go @@ -7,6 +7,7 @@ import ( "gitea.urkob.com/urko/ess-etl-go/config" "gitea.urkob.com/urko/ess-etl-go/internal/api/http/handler" "gitea.urkob.com/urko/ess-etl-go/internal/services" + "gitea.urkob.com/urko/ess-etl-go/pkg/crono" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" @@ -15,12 +16,14 @@ import ( type restServer struct { app *fiber.App cfg *config.Config + cr *crono.Crono employeeWIHdl *handler.EmployeeWorkInformationHandler } -func NewRestServer(cfg *config.Config) *restServer { +func NewRestServer(cfg *config.Config, cr *crono.Crono) *restServer { return &restServer{ cfg: cfg, + cr: cr, } } @@ -42,10 +45,7 @@ func (s *restServer) Start(apiPort, bearerToken string) error { return s.employeeWIHdl.Get(c) }) - s.app.Get("/employee_wi/:id", func(c *fiber.Ctx) error { - return s.employeeWIHdl.Get(c) - }) - + s.cr.MarkAndRestart("server up") if err := s.app.Listen(":" + apiPort); err != nil { return fmt.Errorf("app.Listen: %s", err) }