mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 19:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix error logging a bit

Browse source
This commit is contained in:
Neil Alexander 2020-03-11 11:44:47 +00:00
parent 287b384df4
commit c64f958c70
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appservice/consumers/roomserver.go
View file

@ -86,6 +86,9 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)} vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)}
vQueryRes := api.QueryRoomVersionForRoomIDResponse{} vQueryRes := api.QueryRoomVersionForRoomIDResponse{}
if err := s.query.QueryRoomVersionForRoomID(context.Background(), &vQueryReq, &vQueryRes); err != nil { 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 return err
} }
@ -95,6 +98,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": vQueryRes.RoomVersion, "room_version": vQueryRes.RoomVersion,
}).WithError(err).Errorf("can't prepare event to version") }).WithError(err).Errorf("can't prepare event to version")
return err
} }
if err := json.Unmarshal(msg.Value, &output); err != nil { if err := json.Unmarshal(msg.Value, &output); err != nil {

4
publicroomsapi/consumers/roomserver.go
View file

@ -76,6 +76,9 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)} vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)}
vQueryRes := api.QueryRoomVersionForRoomIDResponse{} vQueryRes := api.QueryRoomVersionForRoomIDResponse{}
if err := s.query.QueryRoomVersionForRoomID(context.Background(), &vQueryReq, &vQueryRes); err != nil { 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 return err
} }
@ -85,6 +88,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": vQueryRes.RoomVersion, "room_version": vQueryRes.RoomVersion,
}).WithError(err).Errorf("can't prepare event to version") }).WithError(err).Errorf("can't prepare event to version")
return err
} }
// Parse out the event JSON // Parse out the event JSON

1
syncapi/consumers/roomserver.go
View file

@ -104,6 +104,7 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent(
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": msg.RoomVersion, "room_version": msg.RoomVersion,
}).WithError(err).Errorf("can't prepare event to version") }).WithError(err).Errorf("can't prepare event to version")
return err
} }
log.WithFields(log.Fields{ log.WithFields(log.Fields{