Improve error handling

mautrix · May 20, 2024 · 22c74d2 · 22c74d2
1 parent eddc2f5
commit 22c74d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/messagix/client.go b/messagix/client.go
@@ -411,7 +411,7 @@ func (c *Client) WaitUntilCanSendMessages(timeout time.Duration) error {
 	for !c.canSendMessages {
 		select {
 		case <-timer.C:
-			return fmt.Errorf("timeout waiting for sending messages")
+			return fmt.Errorf("timeout waiting for canSendMessages")
 		default:
 			c.sendMessagesCond.Wait()
 		}

diff --git a/portal.go b/portal.go
@@ -656,7 +656,10 @@ func (portal *Portal) handleMatrixMessage(ctx context.Context, sender *User, evt
 
 		retries := 0
 		for retries < MaxMetaSendAttempts {
-			sender.Client.WaitUntilCanSendMessages(15 * time.Second)
+			if err := sender.Client.WaitUntilCanSendMessages(15 * time.Second); err != nil {
+				log.Err(err).Msg("Error waiting to be able to send messages")
+				break
+			}
 			resp, err = sender.Client.ExecuteTasks(tasks...)
 			if err == nil {
 				break