Skip to content

Commit a6cf825

Browse files
authored
style: Optimize task timeout code (#267)
1 parent 9106c1b commit a6cf825

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

internal/services/key_delete_service.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ package services
33
import (
44
"fmt"
55
"gpt-load/internal/models"
6-
"time"
76

87
"github.com/sirupsen/logrus"
98
)
109

1110
const (
1211
deleteChunkSize = 1000
13-
deleteTimeout = 30 * time.Minute
1412
)
1513

1614
// KeyDeleteResult holds the result of a delete task.
@@ -40,7 +38,7 @@ func (s *KeyDeleteService) StartDeleteTask(group *models.Group, keysText string)
4038
return nil, fmt.Errorf("no valid keys found in the input text")
4139
}
4240

43-
initialStatus, err := s.TaskService.StartTask(TaskTypeKeyDelete, group.Name, len(keys), deleteTimeout)
41+
initialStatus, err := s.TaskService.StartTask(TaskTypeKeyDelete, group.Name, len(keys))
4442
if err != nil {
4543
return nil, err
4644
}

internal/services/key_import_service.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@ package services
33
import (
44
"fmt"
55
"gpt-load/internal/models"
6-
"time"
76

87
"github.com/sirupsen/logrus"
98
)
109

11-
const (
12-
importTimeout = 30 * time.Minute
13-
)
14-
1510
// KeyImportResult holds the result of an import task.
1611
type KeyImportResult struct {
1712
AddedCount int `json:"added_count"`
@@ -39,7 +34,7 @@ func (s *KeyImportService) StartImportTask(group *models.Group, keysText string)
3934
return nil, fmt.Errorf("no valid keys found in the input text")
4035
}
4136

42-
initialStatus, err := s.TaskService.StartTask(TaskTypeKeyImport, group.Name, len(keys), importTimeout)
37+
initialStatus, err := s.TaskService.StartTask(TaskTypeKeyImport, group.Name, len(keys))
4338
if err != nil {
4439
return nil, err
4540
}

internal/services/key_manual_validation_service.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ func (s *KeyManualValidationService) StartValidationTask(group *models.Group, st
5858
return nil, fmt.Errorf("no keys to validate in group %s", group.Name)
5959
}
6060

61-
timeout := 30 * time.Minute
62-
63-
taskStatus, err := s.TaskService.StartTask(TaskTypeKeyValidation, group.Name, len(keys), timeout)
61+
taskStatus, err := s.TaskService.StartTask(TaskTypeKeyValidation, group.Name, len(keys))
6462
if err != nil {
6563
return nil, err
6664
}

internal/services/task_service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func NewTaskService(store store.Store) *TaskService {
4646
}
4747

4848
// StartTask attempts to start a new task. It returns an error if a task is already running.
49-
func (s *TaskService) StartTask(taskType, groupName string, total int, timeout time.Duration) (*TaskStatus, error) {
49+
func (s *TaskService) StartTask(taskType, groupName string, total int) (*TaskStatus, error) {
5050
currentStatus, err := s.GetTaskStatus()
5151
if err != nil {
5252
return nil, fmt.Errorf("failed to check current task status before starting a new one: %w", err)
@@ -69,7 +69,7 @@ func (s *TaskService) StartTask(taskType, groupName string, total int, timeout t
6969
return nil, fmt.Errorf("failed to serialize new task status: %w", err)
7070
}
7171

72-
if err := s.store.Set(globalTaskKey, statusBytes, timeout); err != nil {
72+
if err := s.store.Set(globalTaskKey, statusBytes, ResultTTL); err != nil {
7373
return nil, fmt.Errorf("failed to set initial task status: %w", err)
7474
}
7575

0 commit comments

Comments
 (0)