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

Fix build

Browse Source
This commit is contained in:
Ken Hibino
2021-05-10 21:19:57 -07:00
parent 4af65d5fa5
commit 1812d05d21
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inspeq/inspector.go
View File

@@ -5,7 +5,6 @@
package inspeq
import (
"errors"
"fmt"
"strconv"
"strings"
@@ -15,6 +14,7 @@ import (
"github.com/google/uuid"
"github.com/hibiken/asynq"
"github.com/hibiken/asynq/internal/base"
"github.com/hibiken/asynq/internal/errors"
"github.com/hibiken/asynq/internal/rdb"
)
@@ -154,10 +154,10 @@ var (
// returns ErrQueueNotEmpty.
func (i *Inspector) DeleteQueue(qname string, force bool) error {
err := i.rdb.RemoveQueue(qname, force)
if _, ok := err.(*rdb.QueueNotFoundError); ok {
if errors.IsQueueNotFound(err) {
return fmt.Errorf("%w: queue=%q", ErrQueueNotFound, qname)
}
if _, ok := err.(*rdb.QueueNotEmptyError); ok {
if errors.IsQueueNotEmpty(err) {
return fmt.Errorf("%w: queue=%q", ErrQueueNotEmpty, qname)
}
return err
@@ -549,13 +549,13 @@ func (i *Inspector) DeleteTaskByKey(qname, key string) error {
}
switch prefix {
case keyPrefixPending:
return i.rdb.DeletePendingTask(qname, id)
return i.rdb.DeleteTask(qname, id)
case keyPrefixScheduled:
return i.rdb.DeleteScheduledTask(qname, id)
return i.rdb.DeleteTask(qname, id)
case keyPrefixRetry:
return i.rdb.DeleteRetryTask(qname, id)
return i.rdb.DeleteTask(qname, id)
case keyPrefixArchived:
return i.rdb.DeleteArchivedTask(qname, id)
return i.rdb.DeleteTask(qname, id)
default:
return fmt.Errorf("invalid key")
}
@@ -657,11 +657,11 @@ func (i *Inspector) ArchiveTaskByKey(qname, key string) error {
}
switch prefix {
case keyPrefixPending:
return i.rdb.ArchivePendingTask(qname, id)
return i.rdb.ArchiveTask(qname, id)
case keyPrefixScheduled:
return i.rdb.ArchiveScheduledTask(qname, id)
return i.rdb.ArchiveTask(qname, id)
case keyPrefixRetry:
return i.rdb.ArchiveRetryTask(qname, id)
return i.rdb.ArchiveTask(qname, id)
case keyPrefixArchived:
return fmt.Errorf("task is already archived")
default:

5
inspeq/inspector_test.go
View File

@@ -5,6 +5,7 @@
package inspeq
import (
"errors"
"flag"
"fmt"
"math"
@@ -271,7 +272,7 @@ func TestInspectorDeleteQueueErrorQueueNotEmpty(t *testing.T) {
h.SeedAllArchivedQueues(t, r, tc.archived)
err := inspector.DeleteQueue(tc.qname, tc.force)
if _, ok := err.(*ErrQueueNotEmpty); !ok {
if !errors.Is(err, ErrQueueNotEmpty) {
t.Errorf("DeleteQueue(%v, %t) did not return ErrQueueNotEmpty",
tc.qname, tc.force)
}
@@ -327,7 +328,7 @@ func TestInspectorDeleteQueueErrorQueueNotFound(t *testing.T) {
h.SeedAllArchivedQueues(t, r, tc.archived)
err := inspector.DeleteQueue(tc.qname, tc.force)
if _, ok := err.(*ErrQueueNotFound); !ok {
if !errors.Is(err, ErrQueueNotFound) {
t.Errorf("DeleteQueue(%v, %t) did not return ErrQueueNotFound",
tc.qname, tc.force)
}