From c64f958c70e69d87edc5fcc2834edcc0ed6dec8a Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 11 Mar 2020 11:44:47 +0000
Subject: [PATCH] Fix error logging a bit

---
 appservice/consumers/roomserver.go     | 4 ++++
 publicroomsapi/consumers/roomserver.go | 4 ++++
 syncapi/consumers/roomserver.go        | 1 +
 3 files changed, 9 insertions(+)

diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go
index 136d07505..de53a09ed 100644
--- a/appservice/consumers/roomserver.go
+++ b/appservice/consumers/roomserver.go
@@ -86,6 +86,9 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 	vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)}
 	vQueryRes := api.QueryRoomVersionForRoomIDResponse{}
 	if err := s.query.QueryRoomVersionForRoomID(context.Background(), &vQueryReq, &vQueryRes); err != nil {
+		log.WithFields(log.Fields{
+			"room_id": string(msg.Key),
+		}).WithError(err).Errorf("can't query room version")
 		return err
 	}
 
@@ -95,6 +98,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 		log.WithFields(log.Fields{
 			"room_version": vQueryRes.RoomVersion,
 		}).WithError(err).Errorf("can't prepare event to version")
+		return err
 	}
 
 	if err := json.Unmarshal(msg.Value, &output); err != nil {
diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go
index d9a678929..22584a1d5 100644
--- a/publicroomsapi/consumers/roomserver.go
+++ b/publicroomsapi/consumers/roomserver.go
@@ -76,6 +76,9 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 	vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)}
 	vQueryRes := api.QueryRoomVersionForRoomIDResponse{}
 	if err := s.query.QueryRoomVersionForRoomID(context.Background(), &vQueryReq, &vQueryRes); err != nil {
+		log.WithFields(log.Fields{
+			"room_id": string(msg.Key),
+		}).WithError(err).Errorf("can't query room version")
 		return err
 	}
 
@@ -85,6 +88,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 		log.WithFields(log.Fields{
 			"room_version": vQueryRes.RoomVersion,
 		}).WithError(err).Errorf("can't prepare event to version")
+		return err
 	}
 
 	// Parse out the event JSON
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index a7569dca1..587398d93 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -104,6 +104,7 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent(
 		log.WithFields(log.Fields{
 			"room_version": msg.RoomVersion,
 		}).WithError(err).Errorf("can't prepare event to version")
+		return err
 	}
 
 	log.WithFields(log.Fields{