mirror of
https://github.com/hibiken/asynq.git
synced 2024-12-26 07:42:17 +08:00
Extract a push logic to a function
This commit is contained in:
parent
bda718bcaa
commit
95023bd3b5
32
asynq.go
32
asynq.go
@ -51,11 +51,7 @@ func NewClient(opt *RedisOpt) *Client {
|
|||||||
// Enqueue pushes a given task to the specified queue.
|
// Enqueue pushes a given task to the specified queue.
|
||||||
func (c *Client) Enqueue(queue string, task *Task, executeAt time.Time) error {
|
func (c *Client) Enqueue(queue string, task *Task, executeAt time.Time) error {
|
||||||
if time.Now().After(executeAt) {
|
if time.Now().After(executeAt) {
|
||||||
bytes, err := json.Marshal(task)
|
return push(c.rdb, queue, task)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return c.rdb.RPush(queuePrefix+queue, string(bytes)).Err()
|
|
||||||
}
|
}
|
||||||
dt := &delayedTask{
|
dt := &delayedTask{
|
||||||
ID: uuid.New().String(),
|
ID: uuid.New().String(),
|
||||||
@ -156,18 +152,9 @@ func (w *Workers) pollScheduledTasks() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if w.rdb.ZRem(scheduled, j).Val() > 0 {
|
if w.rdb.ZRem(scheduled, j).Val() > 0 {
|
||||||
// Do we need to encode this again?
|
err = push(w.rdb, job.Queue, job.Task)
|
||||||
// Can we skip this entirely by defining Task field to be a string field?
|
|
||||||
bytes, err := json.Marshal(job.Task)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("could not marshal job.Task %v: %v\n", job.Task, err)
|
log.Printf("could not push task to queue %q: %v", job.Queue, err)
|
||||||
// TODO(hibiken): Put item that cannot marshal into dead queue.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
err = w.rdb.RPush(queuePrefix+job.Queue, string(bytes)).Err()
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("command RPUSH %q %s failed: %v",
|
|
||||||
queuePrefix+job.Queue, string(bytes), err)
|
|
||||||
// TODO(hibiken): Handle this error properly. Add back to scheduled ZSET?
|
// TODO(hibiken): Handle this error properly. Add back to scheduled ZSET?
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@ -175,3 +162,16 @@ func (w *Workers) pollScheduledTasks() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func push(rdb *redis.Client, queue string, t *Task) error {
|
||||||
|
bytes, err := json.Marshal(t)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("could not encode task into JSON: %v", err)
|
||||||
|
}
|
||||||
|
err = rdb.SAdd(allQueues, queue).Err()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("could not execute command SADD %q %q: %v",
|
||||||
|
allQueues, queue, err)
|
||||||
|
}
|
||||||
|
return rdb.RPush(queuePrefix+queue, string(bytes)).Err()
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user