BREAKING: update mautrix to 0.15.x

bot/queue/manager.go

@@ -1,7 +1,7 @@
 package queue
 
 import (
-	"gitlab.com/etke.cc/go/logger"
+	"github.com/rs/zerolog"
 	"gitlab.com/etke.cc/linkpearl"
 
 	"gitlab.com/etke.cc/postmoogle/bot/config"
@@ -10,8 +10,8 @@ import (
 
 const (
 	acQueueKey          = "cc.etke.postmoogle.mailqueue"
-	defaultQueueBatch   = 1
-	defaultQueueRetries = 3
+	defaultQueueBatch   = 10
+	defaultQueueRetries = 100
 )
 
 // Queue manager
@@ -19,12 +19,12 @@ type Queue struct {
 	mu       utils.Mutex
 	lp       *linkpearl.Linkpearl
 	cfg      *config.Manager
-	log      *logger.Logger
+	log      *zerolog.Logger
 	sendmail func(string, string, string) error
 }
 
 // New queue
-func New(lp *linkpearl.Linkpearl, cfg *config.Manager, log *logger.Logger) *Queue {
+func New(lp *linkpearl.Linkpearl, cfg *config.Manager, log *zerolog.Logger) *Queue {
 	return &Queue{
 		mu:  utils.Mutex{},
 		lp:  lp,
@@ -40,7 +40,7 @@ func (q *Queue) SetSendmail(function func(string, string, string) error) {
 
 // Process queue
 func (q *Queue) Process() {
-	q.log.Debug("staring queue processing...")
+	q.log.Debug().Msg("staring queue processing...")
 	cfg := q.cfg.GetBot()
 
 	batchSize := cfg.QueueBatch()
@@ -57,23 +57,23 @@ func (q *Queue) Process() {
 	defer q.mu.Unlock(acQueueKey)
 	index, err := q.lp.GetAccountData(acQueueKey)
 	if err != nil {
-		q.log.Error("cannot get queue index: %v", err)
+		q.log.Error().Err(err).Msg("cannot get queue index")
 	}
 
 	i := 0
 	for id, itemkey := range index {
 		if i > batchSize {
-			q.log.Debug("finished re-deliveries from queue")
+			q.log.Debug().Msg("finished re-deliveries from queue")
 			return
 		}
 		if dequeue := q.try(itemkey, maxRetries); dequeue {
-			q.log.Info("email %q has been delivered", id)
+			q.log.Info().Str("id", id).Msg("email has been delivered")
 			err = q.Remove(id)
 			if err != nil {
-				q.log.Error("cannot dequeue email %q: %v", id, err)
+				q.log.Error().Err(err).Str("id", id).Msg("cannot dequeue email")
 			}
 		}
 		i++
 	}
-	q.log.Debug("ended queue processing")
+	q.log.Debug().Msg("ended queue processing")
 }

bot/queue/queue.go

@@ -19,7 +19,7 @@ func (q *Queue) Add(id, from, to, data string) error {
 	defer q.mu.Unlock(itemkey)
 	err := q.lp.SetAccountData(itemkey, item)
 	if err != nil {
-		q.log.Error("cannot enqueue email id=%q: %v", id, err)
+		q.log.Error().Err(err).Str("id", id).Msg("cannot enqueue email")
 		return err
 	}
 
@@ -27,13 +27,13 @@ func (q *Queue) Add(id, from, to, data string) error {
 	defer q.mu.Unlock(acQueueKey)
 	queueIndex, err := q.lp.GetAccountData(acQueueKey)
 	if err != nil {
-		q.log.Error("cannot get queue index: %v", err)
+		q.log.Error().Err(err).Msg("cannot get queue index")
 		return err
 	}
 	queueIndex[id] = itemkey
 	err = q.lp.SetAccountData(acQueueKey, queueIndex)
 	if err != nil {
-		q.log.Error("cannot save queue index: %v", err)
+		q.log.Error().Err(err).Msg("cannot save queue index")
 		return err
 	}
 
@@ -44,7 +44,7 @@ func (q *Queue) Add(id, from, to, data string) error {
 func (q *Queue) Remove(id string) error {
 	index, err := q.lp.GetAccountData(acQueueKey)
 	if err != nil {
-		q.log.Error("cannot get queue index: %v", err)
+		q.log.Error().Err(err).Msg("cannot get queue index")
 		return err
 	}
 	itemkey := index[id]
@@ -54,7 +54,7 @@ func (q *Queue) Remove(id string) error {
 	delete(index, id)
 	err = q.lp.SetAccountData(acQueueKey, index)
 	if err != nil {
-		q.log.Error("cannot update queue index: %v", err)
+		q.log.Error().Err(err).Msg("cannot update queue index")
 		return err
 	}
 
@@ -70,13 +70,13 @@ func (q *Queue) try(itemkey string, maxRetries int) bool {
 
 	item, err := q.lp.GetAccountData(itemkey)
 	if err != nil {
-		q.log.Error("cannot retrieve a queue item %q: %v", itemkey, err)
+		q.log.Error().Err(err).Str("id", itemkey).Msg("cannot retrieve a queue item")
 		return false
 	}
-	q.log.Debug("processing queue item %+v", item)
+	q.log.Debug().Any("item", item).Msg("processing queue item")
 	attempts, err := strconv.Atoi(item["attempts"])
 	if err != nil {
-		q.log.Error("cannot parse attempts of %q: %v", itemkey, err)
+		q.log.Error().Err(err).Str("id", itemkey).Msg("cannot parse attempts")
 		return false
 	}
 	if attempts > maxRetries {
@@ -85,16 +85,16 @@ func (q *Queue) try(itemkey string, maxRetries int) bool {
 
 	err = q.sendmail(item["from"], item["to"], item["data"])
 	if err == nil {
-		q.log.Info("email %q from queue was delivered")
+		q.log.Info().Str("id", itemkey).Msg("email from queue was delivered")
 		return true
 	}
 
-	q.log.Info("attempted to deliver email id=%q, retry=%q, but it's not ready yet: %v", item["id"], item["attempts"], err)
+	q.log.Info().Str("id", itemkey).Str("from", item["from"]).Str("to", item["to"]).Err(err).Msg("attempted to deliver email, but it's not ready yet")
 	attempts++
 	item["attempts"] = strconv.Itoa(attempts)
 	err = q.lp.SetAccountData(itemkey, item)
 	if err != nil {
-		q.log.Error("cannot update attempt count on email %q: %v", itemkey, err)
+		q.log.Error().Err(err).Str("id", itemkey).Msg("cannot update attempt count on email")
 	}
 
 	return false