gin logging
This commit is contained in:
@@ -7,11 +7,10 @@ import (
|
||||
"time"
|
||||
|
||||
"git.front.kjuulh.io/kjuulh/curre"
|
||||
"git.front.kjuulh.io/kjuulh/kraken/internal/commands"
|
||||
"git.front.kjuulh.io/kjuulh/kraken/internal/api"
|
||||
"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
|
||||
"git.front.kjuulh.io/kjuulh/kraken/internal/services/jobs"
|
||||
ginzap "github.com/gin-contrib/zap"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
@@ -21,39 +20,12 @@ func NewGinHttpServer(logger *zap.Logger, deps *serverdeps.ServerDeps) curre.Com
|
||||
|
||||
return curre.NewFunctionalComponent(&curre.FunctionalComponent{
|
||||
InitFunc: func(_ *curre.FunctionalComponent, _ context.Context) error {
|
||||
app = gin.Default()
|
||||
app = gin.New()
|
||||
app.UseH2C = true
|
||||
app.Use(ginzap.Ginzap(logger, time.RFC3339, true))
|
||||
app.Use(ginzap.RecoveryWithZap(logger, true))
|
||||
|
||||
healthRoute := app.Group("/health")
|
||||
healthRoute.GET("/ready", func(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"message": "healthy",
|
||||
})
|
||||
})
|
||||
|
||||
commandRoute := app.Group("commands")
|
||||
commandRoute.POST("processRepos", func(c *gin.Context) {
|
||||
type processReposRequest struct {
|
||||
RepositoryUrls []string `json:"repositoryUrls"`
|
||||
}
|
||||
var request processReposRequest
|
||||
err := c.BindJSON(&request)
|
||||
if err != nil {
|
||||
logger.Info("could not bind request", zap.String("request", "processRepo"), zap.Error(err))
|
||||
c.AbortWithStatus(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
jobId := uuid.New().String()
|
||||
|
||||
go func(repositoryUrls []string, jobId string) {
|
||||
ctx := context.WithValue(context.Background(), jobs.JobId{}, jobId)
|
||||
processRepos := commands.NewProcessRepos(logger, deps)
|
||||
err = processRepos.Process(ctx, repositoryUrls, nil)
|
||||
}(request.RepositoryUrls, jobId)
|
||||
|
||||
c.Status(http.StatusAccepted)
|
||||
})
|
||||
api.BuildApi(logger, app, deps)
|
||||
|
||||
server = &http.Server{
|
||||
Addr: "127.0.0.1:3000",
|
||||
|
@@ -14,7 +14,7 @@ func Start(logger *zap.Logger) error {
|
||||
deps := serverdeps.NewServerDeps(logger)
|
||||
|
||||
return curre.NewManager().
|
||||
Register(NewGinHttpServer(logger.With(zap.String("app", "ginHttpServer")), deps)).
|
||||
Register(NewStorageServer(logger.With(zap.String("app", "storageServer")), deps)).
|
||||
Register(NewGinHttpServer(logger.With(zap.Namespace("ginHttpServer")), deps)).
|
||||
Register(NewStorageServer(logger.With(zap.Namespace("storageServer")), deps)).
|
||||
Run(ctx)
|
||||
}
|
||||
|
Reference in New Issue
Block a user