diff --git a/internal/rdb/inspect.go b/internal/rdb/inspect.go index 2417563..31e1fbf 100644 --- a/internal/rdb/inspect.go +++ b/internal/rdb/inspect.go @@ -942,7 +942,6 @@ func (r *RDB) archiveAll(src, dst, qname string) (int64, error) { keys := []string{ src, dst, - base.AllQueues, } now := time.Now() argv := []interface{}{ @@ -1107,15 +1106,11 @@ func (r *RDB) deleteAll(key, qname string) (int64, error) { if err := r.checkQueueExists(qname); err != nil { return 0, err } - keys := []string{ - key, - base.AllQueues, - } argv := []interface{}{ base.TaskKeyPrefix(qname), qname, } - res, err := deleteAllCmd.Run(r.client, keys, argv...).Result() + res, err := deleteAllCmd.Run(r.client, []string{key}, argv...).Result() if err != nil { return 0, err } @@ -1369,33 +1364,33 @@ var listWorkersCmd = redis.NewScript(` local now = tonumber(ARGV[1]) local keys = redis.call("ZRANGEBYSCORE", KEYS[1], now, "+inf") redis.call("ZREMRANGEBYSCORE", KEYS[1], "-inf", now-1) -local res = {} -for _, key in ipairs(keys) do - local vals = redis.call("HVALS", key) - for _, v in ipairs(vals) do - table.insert(res, v) - end -end -return res`) +return keys`) // ListWorkers returns the list of worker stats. func (r *RDB) ListWorkers() ([]*base.WorkerInfo, error) { + var op errors.Op = "rdb.ListWorkers" now := time.Now() res, err := listWorkersCmd.Run(r.client, []string{base.AllWorkers}, now.Unix()).Result() if err != nil { - return nil, err + return nil, errors.E(op, errors.Unknown, err) } - data, err := cast.ToStringSliceE(res) + keys, err := cast.ToStringSliceE(res) if err != nil { - return nil, err + return nil, errors.E(op, errors.Internal, fmt.Sprintf("unexpeced return value from Lua script: %v", res)) } var workers []*base.WorkerInfo - for _, s := range data { - w, err := base.DecodeWorkerInfo([]byte(s)) + for _, key := range keys { + data, err := r.client.HVals(key).Result() if err != nil { continue // skip bad data } - workers = append(workers, w) + for _, s := range data { + w, err := base.DecodeWorkerInfo([]byte(s)) + if err != nil { + continue // skip bad data + } + workers = append(workers, w) + } } return workers, nil }