From 55a76c5c6b3336438ef3ce2224e02011d9629e8e Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 23 Aug 2022 17:45:15 +0300 Subject: [PATCH] Use just Error, not Warn + Error The downside of this is that the raw error gets reported to the user in the room, instead of just being logged. --- bot/mailbox.go | 6 ++---- bot/owner.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bot/mailbox.go b/bot/mailbox.go index 9f8557a..87d2e7f 100644 --- a/bot/mailbox.go +++ b/bot/mailbox.go @@ -49,8 +49,7 @@ func (b *Bot) getMailbox(ctx context.Context, evt *event.Event) { cfg, err := b.getSettings(span.Context(), evt.RoomID) if err != nil { - b.log.Warn("cannot get %s settings: %v", evt.RoomID, err) - b.Error(span.Context(), evt.RoomID, "failed to retrieve settings") + b.Error(span.Context(), evt.RoomID, "failed to retrieve setting: %v", err) return } @@ -83,8 +82,7 @@ func (b *Bot) setMailbox(ctx context.Context, evt *event.Event, mailbox string) } cfg, err := b.getSettings(span.Context(), evt.RoomID) if err != nil { - b.log.Warn("cannot get settings: %v", err) - b.Error(span.Context(), evt.RoomID, "failed to retrieve settings") + b.Error(span.Context(), evt.RoomID, "failed to retrieve setting: %v", err) return } diff --git a/bot/owner.go b/bot/owner.go index 6af5e2d..a412d21 100644 --- a/bot/owner.go +++ b/bot/owner.go @@ -23,8 +23,7 @@ func (b *Bot) getOwner(ctx context.Context, evt *event.Event) { cfg, err := b.getSettings(span.Context(), evt.RoomID) if err != nil { - b.log.Warn("cannot get settings: %v", err) - b.Error(span.Context(), evt.RoomID, "failed to retrieve settings") + b.Error(span.Context(), evt.RoomID, "failed to retrieve setting: %v", err) return } @@ -48,8 +47,7 @@ func (b *Bot) setOwner(ctx context.Context, evt *event.Event, owner string) { ownerID := id.UserID(owner) cfg, err := b.getSettings(span.Context(), evt.RoomID) if err != nil { - b.log.Warn("cannot get settings: %v", err) - b.Error(span.Context(), evt.RoomID, "failed to retrieve settings") + b.Error(span.Context(), evt.RoomID, "failed to retrieve setting: %v", err) return }