go-pkg/asynq
2
0
Fork 0
mirror of https://github.com/hibiken/asynq.git synced 2025-08-19 15:08:55 +08:00
Code Issues Projects Releases Wiki Activity

Use int64 type for Timeout and Deadline in TaskMessage

Browse Source
This commit is contained in:
Ken Hibino
2020-06-22 08:33:58 -07:00
parent 379da8f7a2
commit 7e942ec241
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/base/base.go
View File

@@ -94,7 +94,7 @@ type TaskMessage struct {
// if retry count is remaining. Otherwise it will be moved to the dead queue.
//
// Use zero to indicate no timeout.
Timeout int
Timeout int64
// Deadline specifies the deadline for the task in Unix time,
// the number of seconds elapsed since January 1, 1970 UTC.
@@ -102,7 +102,7 @@ type TaskMessage struct {
// if retry count is remaining. Otherwise it will be moved to the dead queue.
//
// Use zero to indicate no deadline.
Deadline int
Deadline int64
// UniqueKey holds the redis key used for uniqueness lock for this task.
//

28
internal/rdb/rdb_test.go
View File

@@ -122,7 +122,7 @@ func TestDequeue(t *testing.T) {
Timeout: 1800,
Deadline: 0,
}
t1Deadline := int(now.Unix()) + t1.Timeout
t1Deadline := now.Unix() + t1.Timeout
t2 := &base.TaskMessage{
ID: xid.New(),
Type: "export_csv",
@@ -135,10 +135,10 @@ func TestDequeue(t *testing.T) {
ID: xid.New(),
Type: "reindex",
Payload: nil,
Timeout: int((5 * time.Minute).Seconds()),
Deadline: int(time.Now().Add(10 * time.Minute).Unix()),
Timeout: int64((5 * time.Minute).Seconds()),
Deadline: time.Now().Add(10 * time.Minute).Unix(),
}
t3Deadline := int(now.Unix()) + t3.Timeout // use whichever is earliest
t3Deadline := now.Unix() + t3.Timeout // use whichever is earliest
tests := []struct {
enqueued map[string][]*base.TaskMessage
@@ -392,7 +392,7 @@ func TestDone(t *testing.T) {
Timeout: 1800,
Deadline: 0,
}
t1Deadline := int(now.Unix()) + t1.Timeout
t1Deadline := now.Unix() + t1.Timeout
t2 := &base.TaskMessage{
ID: xid.New(),
Type: "export_csv",
@@ -410,7 +410,7 @@ func TestDone(t *testing.T) {
UniqueKey: "reindex:nil:default",
Queue: "default",
}
t3Deadline := int(now.Unix()) + t3.Deadline
t3Deadline := now.Unix() + t3.Deadline
tests := []struct {
inProgress []*base.TaskMessage // initial state of the in-progress list
@@ -555,9 +555,9 @@ func TestRequeue(t *testing.T) {
Queue: "critical",
Timeout: 80,
}
t1Deadline := int(now.Unix()) + t1.Timeout
t2Deadline := int(now.Unix()) + t2.Timeout
t3Deadline := int(now.Unix()) + t3.Timeout
t1Deadline := now.Unix() + t1.Timeout
t2Deadline := now.Unix() + t2.Timeout
t3Deadline := now.Unix() + t3.Timeout
tests := []struct {
enqueued map[string][]*base.TaskMessage // initial state of queues
@@ -748,14 +748,14 @@ func TestRetry(t *testing.T) {
Payload: map[string]interface{}{"subject": "Hola!"},
Timeout: 1800,
}
t1Deadline := int(now.Unix()) + t1.Timeout
t1Deadline := now.Unix() + t1.Timeout
t2 := &base.TaskMessage{
ID: xid.New(),
Type: "gen_thumbnail",
Payload: map[string]interface{}{"path": "some/path/to/image.jpg"},
Timeout: 3000,
}
t2Deadline := int(now.Unix()) + t2.Timeout
t2Deadline := now.Unix() + t2.Timeout
t3 := &base.TaskMessage{
ID: xid.New(),
Type: "reindex",
@@ -877,7 +877,7 @@ func TestKill(t *testing.T) {
Retried: 0,
Timeout: 1800,
}
t1Deadline := int(now.Unix()) + t1.Timeout
t1Deadline := now.Unix() + t1.Timeout
t2 := &base.TaskMessage{
ID: xid.New(),
Type: "reindex",
@@ -887,7 +887,7 @@ func TestKill(t *testing.T) {
Retried: 0,
Timeout: 3000,
}
t2Deadline := int(now.Unix()) + t2.Timeout
t2Deadline := now.Unix() + t2.Timeout
t3 := &base.TaskMessage{
ID: xid.New(),
Type: "generate_csv",
@@ -897,7 +897,7 @@ func TestKill(t *testing.T) {
Retried: 0,
Timeout: 60,
}
t3Deadline := int(now.Unix()) + t3.Timeout
t3Deadline := now.Unix() + t3.Timeout
errMsg := "SMTP server not responding"
t1AfterKill := &base.TaskMessage{
ID: t1.ID,