page timeout added

This commit is contained in:
nquidox 2026-02-28 23:33:22 +03:00
parent 56309cafb9
commit f466566505
3 changed files with 17 additions and 9 deletions

View file

@ -75,9 +75,6 @@ func (app *App) Run(ctx context.Context) {
//main //main
apiClient := newApiClient(app.config.GrpcCfg.ApiClientHost + ":" + app.config.GrpcCfg.ApiClientPort) apiClient := newApiClient(app.config.GrpcCfg.ApiClientHost + ":" + app.config.GrpcCfg.ApiClientPort)
period := time.NewTicker(app.checkPeriod * time.Hour)
defer period.Stop()
sender := make(chan shared.TaskResult, app.numCPUs*10) sender := make(chan shared.TaskResult, app.numCPUs*10)
defer close(sender) defer close(sender)
@ -96,6 +93,7 @@ func (app *App) Run(ctx context.Context) {
Enabled: app.config.OriginEnabled.Mandarake, Enabled: app.config.OriginEnabled.Mandarake,
ExternalBrowser: app.config.ExternalBrowser, ExternalBrowser: app.config.ExternalBrowser,
GoroutinesNumber: app.numCPUs, GoroutinesNumber: app.numCPUs,
TaskTimeout: app.config.TasksCfg.TaskTimeout,
}) })
} }
@ -117,6 +115,9 @@ func (app *App) Run(ctx context.Context) {
taskProcessor.StartWork(ctx, receivedTasks) taskProcessor.StartWork(ctx, receivedTasks)
} }
period := time.NewTicker(app.checkPeriod * time.Hour)
defer period.Stop()
go func() { go func() {
process() //immediate start process() //immediate start
for range period.C { for range period.C {

View file

@ -16,9 +16,6 @@ func (s *Parser) HandleTasks(ctx context.Context, tasks []shared.Task, sender ch
allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser) allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser)
defer allocCancel() defer allocCancel()
sessionCtx, sessionCancel := chromedp.NewContext(allocCtx /* chromedp.WithLogf(log.Printf) */, chromedp.WithLogf(func(string, ...any) {}))
defer sessionCancel()
receiver := make(chan shared.Task, len(tasks)) receiver := make(chan shared.Task, len(tasks))
for _, task := range tasks { for _, task := range tasks {
receiver <- task receiver <- task
@ -31,7 +28,7 @@ func (s *Parser) HandleTasks(ctx context.Context, tasks []shared.Task, sender ch
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
s.worker(sessionCtx, receiver, sender) s.worker(allocCtx, receiver, sender)
}() }()
} }
wg.Wait() wg.Wait()
@ -42,14 +39,20 @@ func (s *Parser) HandleTasks(ctx context.Context, tasks []shared.Task, sender ch
func (s *Parser) worker(ctx context.Context, receiver chan shared.Task, sender chan shared.TaskResult) { func (s *Parser) worker(ctx context.Context, receiver chan shared.Task, sender chan shared.TaskResult) {
for task := range receiver { for task := range receiver {
taskCtx, taskCancel := chromedp.NewContext(ctx /* chromedp.WithLogf(log.Printf) */, chromedp.WithLogf(func(string, ...any) {}))
timeoutCtx, timeoutCancel := context.WithTimeout(taskCtx, s.taskTimeout)
log.WithField("task_uuid", task.MerchUuid).Infof("%v %v processing task", logHeader, logWorker) log.WithField("task_uuid", task.MerchUuid).Infof("%v %v processing task", logHeader, logWorker)
//price will be zeroPrice value in case of any error or if price not found //price will be zeroPrice value in case of any error or if price not found
price := s.getMinimalPrice(ctx, task) price := s.getMinimalPrice(timeoutCtx, task)
sender <- shared.TaskResult{ sender <- shared.TaskResult{
MerchUuid: task.MerchUuid, MerchUuid: task.MerchUuid,
Origin: task.Origin, Origin: task.Origin,
Price: price, Price: price,
} }
timeoutCancel()
taskCancel()
} }
} }

View file

@ -2,6 +2,7 @@ package mandarake
import ( import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"time"
) )
const ( const (
@ -16,22 +17,25 @@ const (
type Parser struct { type Parser struct {
externalBrowser string externalBrowser string
goroutinesNumber int goroutinesNumber int
taskTimeout time.Duration
} }
type Deps struct { type Deps struct {
Enabled bool Enabled bool
ExternalBrowser string ExternalBrowser string
GoroutinesNumber int GoroutinesNumber int
TaskTimeout int
} }
func NewParser(deps Deps) *Parser { func NewParser(deps Deps) *Parser {
if !deps.Enabled { if !deps.Enabled {
log.Info(logHeader + "disabled") log.Infof("%v disabled", logHeader)
return nil return nil
} }
return &Parser{ return &Parser{
externalBrowser: deps.ExternalBrowser, externalBrowser: deps.ExternalBrowser,
goroutinesNumber: deps.GoroutinesNumber, goroutinesNumber: deps.GoroutinesNumber,
taskTimeout: time.Minute * time.Duration(deps.TaskTimeout),
} }
} }