gin logger

cmd/main.go

@@ -21,7 +21,7 @@ func main() {
 
 	logging.LogSetup(c.LogLevel)
 
-	if c.Metrics.GinMode != "release" {
+	if c.PprofEnabled {
 		go func() {
 			log.Println(http.ListenAndServe("localhost:6060", nil))
 		}()

config.env

@@ -2,6 +2,7 @@ APP_LOG_LEVEL=error
 APP_NUMCPUS=-1
 APP_CHECK_PERIOD=6
 EXTERNAL_BROWSER=
+PPROF_ENABLED=false
 
 GRPC_SERVER_HOST=0.0.0.0
 GRPC_SERVER_PORT=9060

config/config.go

@@ -7,6 +7,7 @@ import (
 )
 
 type Config struct {
+	PprofEnabled    bool
 	LogLevel        string
 	NumCPUs         int
 	CheckPeriod     int
@@ -46,6 +47,7 @@ type MetricsConfig struct {
 
 func NewConfig() *Config {
 	return &Config{
+		PprofEnabled:    getEnvBool("PPROF_ENABLED", true),
 		LogLevel:        getEnv("APP_LOG_LEVEL", "debug"),
 		NumCPUs:         getEnvInt("APP_NUMCPUS", -1),
 		CheckPeriod:     getEnvInt("APP_CHECK_PERIOD", 6),

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(apiClient, sendData)
+					app.network.SendResult(ctx, apiClient, sendData)
 					sendData = sendData[:0]
 				}
 			}

internal/parsers/mandarake/handleTasks.go

@@ -10,8 +10,39 @@ 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`, &copyright, 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 %v handling tasks", logHeader, logWorker)
+	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)
 
 	allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser)
 	defer allocCancel()

internal/remote/interface.go

@@ -8,5 +8,5 @@ import (
 
 type Handler interface {
 	RequestTasks(ctx context.Context, client pb.TaskProcessorClient) []shared.TaskResponse
-	SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult)
+	SendResult(ctx context.Context, client pb.TaskProcessorClient, tasksDone []shared.TaskResult)
 }

internal/remote/send.go

@@ -5,10 +5,14 @@ import (
 	log "github.com/sirupsen/logrus"
 	"task-processor/internal/shared"
 	pb "task-processor/proto/taskProcessor"
+	"time"
 )
 
-func (n *Network) SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult) {
-	stream, err := client.SendResult(context.Background())
+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)
 	if err != nil {
 		log.Fatalf("Error calling PostMerch: %v", err)
 	}
@@ -29,7 +33,12 @@ func (n *Network) SendResult(client pb.TaskProcessorClient, tasksDone []shared.T
 		}
 	}
 
-	if err = stream.CloseSend(); err != nil {
-		log.Fatalf("Error closing stream: %v", err)
+	//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)
 	}
 }

pkg/router/handler.go

@@ -21,7 +21,7 @@ type Deps struct {
 const pkgLogHeader string = "Router |"
 
 func NewHandler(deps Deps) *Handler {
-	engine := gin.Default()
+	engine := gin.New()
 
 	if deps.GinMode == "release" {
 		gin.SetMode(gin.ReleaseMode)
@@ -32,7 +32,8 @@ func NewHandler(deps Deps) *Handler {
 		}
 	}
 
-	engine.GET("/", func(c *gin.Context) { c.JSON(200, gin.H{"msg": "v2"}) })
+	logGroup := engine.Group("")
+	logGroup.GET("/", func(c *gin.Context) { c.JSON(200, gin.H{"msg": "v2"}) })
 
 	p := ginprometheus.NewPrometheus("gin")
 	p.Use(engine)