diff --git a/internal/app/app.go b/internal/app/app.go index 4f27a7d..c7359e1 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -141,7 +141,7 @@ func (app *App) Run(ctx context.Context) { l := len(sendData) if l > 0 { log.WithField("length", l).Debug("Sending parsed data") - app.network.SendResult(ctx, apiClient, sendData) + app.network.SendResult(apiClient, sendData) sendData = sendData[:0] } } diff --git a/internal/parsers/mandarake/handleTasks.go b/internal/parsers/mandarake/handleTasks.go index 8596747..1ddd10a 100644 --- a/internal/parsers/mandarake/handleTasks.go +++ b/internal/parsers/mandarake/handleTasks.go @@ -10,39 +10,8 @@ import ( "task-processor/internal/shared" ) -func (s *Parser) setupBrowser(ctx context.Context) (string, error) { - allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser) - defer allocCancel() - - pageCtx, pageCancel := chromedp.NewContext(allocCtx, chromedp.WithLogf(func(string, ...any) {})) - defer pageCancel() - - copyright := "No copyright div found." - - if err := chromedp.Run(pageCtx, - chromedp.Navigate("https://www.mandarake.co.jp/"), - chromedp.WaitReady("body", chromedp.ByQuery), - chromedp.Text(`div.copyright`, ©right, chromedp.ByQuery, chromedp.AtLeast(0)), - chromedp.Navigate("https://www.mandarake.co.jp/index2.html"), - chromedp.WaitReady("body", chromedp.ByQuery), - ); err != nil { - log.WithError(err).Error(logHeader + logGetPrice + "failed to get single price tag") - return copyright, err - } - - return copyright, nil -} - func (s *Parser) HandleTasks(ctx context.Context, tasks []shared.Task, sender chan shared.TaskResult, state *appState.State) { - log.Infof("%v Start handling tasks", logHeader) - log.Infof("%v Setting up browser", logHeader) - cr, err := s.setupBrowser(ctx) - if err != nil { - log.WithError(err).Error(logHeader + logGetPrice + "failed to setup browser") - } - log.WithField("Copyright message", cr).Infof("%v Finished setting up browser.", logHeader) - - log.Infof("%v %v processing tasks...", logHeader, logWorker) + log.Infof("%v %v handling tasks", logHeader, logWorker) allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser) defer allocCancel() diff --git a/internal/remote/interface.go b/internal/remote/interface.go index 210d214..b34de33 100644 --- a/internal/remote/interface.go +++ b/internal/remote/interface.go @@ -8,5 +8,5 @@ import ( type Handler interface { RequestTasks(ctx context.Context, client pb.TaskProcessorClient) []shared.TaskResponse - SendResult(ctx context.Context, client pb.TaskProcessorClient, tasksDone []shared.TaskResult) + SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult) } diff --git a/internal/remote/send.go b/internal/remote/send.go index 046fadf..6e9c148 100644 --- a/internal/remote/send.go +++ b/internal/remote/send.go @@ -5,14 +5,10 @@ import ( log "github.com/sirupsen/logrus" "task-processor/internal/shared" pb "task-processor/proto/taskProcessor" - "time" ) -func (n *Network) SendResult(ctx context.Context, client pb.TaskProcessorClient, tasksDone []shared.TaskResult) { - sendCtx, cancel := context.WithTimeout(ctx, time.Second*60) - defer cancel() - - stream, err := client.SendResult(sendCtx) +func (n *Network) SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult) { + stream, err := client.SendResult(context.Background()) if err != nil { log.Fatalf("Error calling PostMerch: %v", err) } @@ -33,12 +29,7 @@ func (n *Network) SendResult(ctx context.Context, client pb.TaskProcessorClient, } } - //if err = stream.CloseSend(); err != nil { - // log.Fatalf("Error closing stream: %v", err) - //} - - _, err = stream.CloseAndRecv() - if err != nil { - log.Fatalf("Error receiving response: %v", err) + if err = stream.CloseSend(); err != nil { + log.Fatalf("Error closing stream: %v", err) } } diff --git a/pkg/router/handler.go b/pkg/router/handler.go index 0f924cc..5ede9de 100644 --- a/pkg/router/handler.go +++ b/pkg/router/handler.go @@ -21,7 +21,7 @@ type Deps struct { const pkgLogHeader string = "Router |" func NewHandler(deps Deps) *Handler { - engine := gin.New() + engine := gin.Default() if deps.GinMode == "release" { gin.SetMode(gin.ReleaseMode) @@ -32,12 +32,17 @@ func NewHandler(deps Deps) *Handler { } } - logGroup := engine.Group("") - logGroup.GET("/", func(c *gin.Context) { c.JSON(200, gin.H{"msg": "v2"}) }) + engine.GET("/", func(c *gin.Context) { c.JSON(200, gin.H{"msg": "v2"}) }) p := ginprometheus.NewPrometheus("gin") p.Use(engine) + engine.Use(gin.LoggerWithConfig(gin.LoggerConfig{ + Skip: func(c *gin.Context) bool { + return c.Request.URL.Path == "/metrics" + }, + })) + srv := http.Server{ Addr: deps.Addr, Handler: engine,