From 091e98a2d12b5a3f6b8b8bc622c406dcaa6be63c Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 10 Mar 2020 16:18:24 +0000 Subject: [PATCH] more logging needed --- appservice/consumers/roomserver.go | 4 ++++ clientapi/consumers/roomserver.go | 4 ++++ federationsender/consumers/roomserver.go | 4 ++++ publicroomsapi/consumers/roomserver.go | 4 ++++ syncapi/consumers/roomserver.go | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index aa6a47e9e..77d649950 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -97,6 +97,10 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // TODO: Is this trusted here? ev, err := gomatrixserverlib.NewEventFromTrustedJSON(output.NewRoomEvent.Event, false, output.NewRoomEvent.RoomVersion) if err != nil { + log.WithError(err).WithField("roomversion", output.NewRoomEvent.RoomVersion).Errorf( + "roomserver output log: couldn't create event from trusted JSON (%d bytes)", + len(output.NewRoomEvent.Event), + ) return err } diff --git a/clientapi/consumers/roomserver.go b/clientapi/consumers/roomserver.go index 4e9912513..78da7e4d5 100644 --- a/clientapi/consumers/roomserver.go +++ b/clientapi/consumers/roomserver.go @@ -87,6 +87,10 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // TODO: Is this trusted here? ev, err := gomatrixserverlib.NewEventFromTrustedJSON(output.NewRoomEvent.Event, false, output.NewRoomEvent.RoomVersion) if err != nil { + log.WithError(err).WithField("roomversion", output.NewRoomEvent.RoomVersion).Errorf( + "roomserver output log: couldn't create event from trusted JSON (%d bytes)", + len(output.NewRoomEvent.Event), + ) return err } diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go index e348b0188..932f01e5a 100644 --- a/federationsender/consumers/roomserver.go +++ b/federationsender/consumers/roomserver.go @@ -186,6 +186,10 @@ func (s *OutputRoomEventConsumer) joinedHostsAtEvent( // TODO: Is this trusted here? ev, err := gomatrixserverlib.NewEventFromTrustedJSON(ore.Event, false, ore.RoomVersion) if err != nil { + log.WithError(err).WithField("roomversion", ore.RoomVersion).Errorf( + "roomserver output log: couldn't create event from trusted JSON (%d bytes)", + len(ore.Event), + ) return nil, err } diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go index be9602b7e..dd2c6c107 100644 --- a/publicroomsapi/consumers/roomserver.go +++ b/publicroomsapi/consumers/roomserver.go @@ -81,6 +81,10 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // TODO: Is this trusted here? ev, err := gomatrixserverlib.NewEventFromTrustedJSON(output.NewRoomEvent.Event, false, output.NewRoomEvent.RoomVersion) if err != nil { + log.WithError(err).WithField("roomversion", output.NewRoomEvent.RoomVersion).Errorf( + "roomserver output log: couldn't create event from trusted JSON (%d bytes)", + len(output.NewRoomEvent.Event), + ) return err } diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index e839a056f..e1bf8e0a0 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -101,6 +101,10 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent( // TODO: Is this trusted here? ev, err := gomatrixserverlib.NewEventFromTrustedJSON(msg.Event, false, msg.RoomVersion) if err != nil { + log.WithError(err).WithField("roomversion", msg.RoomVersion).Errorf( + "roomserver output log: couldn't create event from trusted JSON (%d bytes)", + len(msg.Event), + ) return err }