all repos — homestead @ 4c07535d9120fb999b0c008f1866972865f424f7

Code for my website

replace tozd/errors with Southclaws/fault

Alan Pearce
commit

4c07535d9120fb999b0c008f1866972865f424f7

parent

90a4ac43b915abb7a2949f4b5313b40d705b6071

1 file changed, 7 insertions(+), 6 deletions(-)

changed files
M internal/events/redis.gointernal/events/redis.go
@@ -7,8 +7,9 @@ "fmt"
"strconv" "time" + "github.com/Southclaws/fault" + "github.com/Southclaws/fault/fmsg" "github.com/redis/go-redis/v9" - "gitlab.com/tozd/go/errors" "go.alanpearce.eu/x/log" "go.uber.org/zap" )
@@ -37,7 +38,7 @@ client *redis.Client
log *log.Logger } -func NewRedisListener(opts *RedisOptions, log *log.Logger) (*RedisListener, errors.E) { +func NewRedisListener(opts *RedisOptions, log *log.Logger) (*RedisListener, error) { clientConfig := &redis.Options{ Addr: opts.Address, Username: opts.Username,
@@ -68,18 +69,18 @@ log: log,
}, nil } -func (rl *RedisListener) GetLatestRunID() (uint64, errors.E) { +func (rl *RedisListener) GetLatestRunID() (uint64, error) { ctx, cancel := context.WithTimeout(context.TODO(), 2*time.Second) defer cancel() payload, err := rl.client.Get(ctx, key).Result() if err != nil { - return fallbackRunID, errors.WithMessage(err, "could not get latest run ID") + return fallbackRunID, fault.Wrap(err, fmsg.With("could not get latest run ID")) } runID, err := strconv.ParseUint(payload, 10, 64) if err != nil { - return fallbackRunID, errors.WithMessage(err, "could not parse latest run ID") + return fallbackRunID, fault.Wrap(err, fmsg.With("could not parse latest run ID")) } rl.log.Debug("redis response", "payload", payload, "run_id", runID)
@@ -92,7 +93,7 @@ func getKeyspaceName(key string) string {
return fmt.Sprintf("__keyspace@%d__:%s", db, key) } -func (rl *RedisListener) Subscribe() (<-chan Event, errors.E) { +func (rl *RedisListener) Subscribe() (<-chan Event, error) { events := make(chan Event, 1) ctx := context.TODO() channel := getKeyspaceName(key)