fix: set different timeout for rank

ShugetsuSoft · Apr 21, 2023 · 5051c37 · 5051c37
1 parent d72222c
commit 5051c37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/common/database/tasktracer/tracer.go b/common/database/tasktracer/tracer.go
@@ -161,8 +161,8 @@ func (tl *TaskListener) CloseChan() {
 	tl.redis.Close()
 }
 
-func (tl *TaskListener) WaitFor(ctx context.Context, tid string) error {
-	timeout := time.After(1 * time.Minute)
+func (tl *TaskListener) WaitFor(ctx context.Context, tid string, delay time.Duration) error {
+	timeout := time.After(delay)
 	signal := make(chan error, 1)
 	go func() {
 		tl.cond.L.Lock()

diff --git a/modules/responser/task/gens.go b/modules/responser/task/gens.go
@@ -3,6 +3,7 @@ package task
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/ShugetsuSoft/pixivel-back/common/models"
 	"github.com/ShugetsuSoft/pixivel-back/common/utils"
@@ -28,7 +29,7 @@ func (gen *TaskGenerator) IllustDetailTask(ctx context.Context, id uint64) error
 			return err
 		}
 	}
-	err = gen.tracerlistener.WaitFor(ctx, tid)
+	err = gen.tracerlistener.WaitFor(ctx, tid, time.Minute)
 	if err != nil {
 		gen.tracer.RemoveTaskGroup(tid)
 		return err
@@ -55,7 +56,7 @@ func (gen *TaskGenerator) UgoiraDetailTask(ctx context.Context, id uint64) error
 			return err
 		}
 	}
-	err = gen.tracerlistener.WaitFor(ctx, tid)
+	err = gen.tracerlistener.WaitFor(ctx, tid, time.Minute)
 	if err != nil {
 		gen.tracer.RemoveTaskGroup(tid)
 		return err
@@ -82,7 +83,7 @@ func (gen *TaskGenerator) UserDetailTask(ctx context.Context, id uint64) error {
 			return err
 		}
 	}
-	err = gen.tracerlistener.WaitFor(ctx, tid)
+	err = gen.tracerlistener.WaitFor(ctx, tid, time.Minute)
 	if err != nil {
 		gen.tracer.RemoveTaskGroup(tid)
 		return err
@@ -109,7 +110,7 @@ func (gen *TaskGenerator) UserIllustsTask(ctx context.Context, id uint64) error
 			return err
 		}
 	}
-	err = gen.tracerlistener.WaitFor(ctx, tid)
+	err = gen.tracerlistener.WaitFor(ctx, tid, time.Minute)
 	if err != nil {
 		gen.tracer.RemoveTaskGroup(tid)
 		return err
@@ -135,7 +136,7 @@ func (gen *TaskGenerator) RankInitTask(ctx context.Context, mode string, date st
 			return err
 		}
 	}
-	err = gen.tracerlistener.WaitFor(ctx, tid)
+	err = gen.tracerlistener.WaitFor(ctx, tid, 5*time.Minute)
 	if err != nil {
 		gen.tracer.RemoveTaskGroup(tid)
 		return err