Don't log the same error twice, undo unrelated change

matrix-org · Dec 1, 2023 · 0992337 · 0992337
1 parent d216eea
commit 0992337
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go
@@ -119,7 +119,7 @@ func (s *OutputRoomEventConsumer) onMessage(
 	for _, msg := range msgs {
 		// Only handle events we care about
 		receivedType := api.OutputType(msg.Header.Get(jetstream.RoomEventType))
-		if receivedType != api.OutputTypeNewRoomEvent {
+		if receivedType != api.OutputTypeNewRoomEvent && receivedType != api.OutputTypeNewInviteEvent {
 			continue
 		}
 		// Parse out the event JSON

diff --git a/syncapi/producers/appservices.go b/syncapi/producers/appservices.go
@@ -16,7 +16,6 @@ package producers
 
 import (
 	"github.com/nats-io/nats.go"
-	"github.com/sirupsen/logrus"
 )
 
 // AppserviceEventProducer produces events for the appservice API to consume
@@ -29,9 +28,6 @@ func (a *AppserviceEventProducer) ProduceRoomEvents(
 	msg *nats.Msg,
 ) error {
 	msg.Subject = a.Topic
-	if _, err := a.JetStream.PublishMsg(msg); err != nil {
-		logrus.WithError(err).Errorf("Failed to produce to topic '%s': %s", a.Topic, err)
-		return err
-	}
-	return nil
+	_, err := a.JetStream.PublishMsg(msg)
+	return err
 }