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

Debug logging

Browse source
This commit is contained in:
Neil Alexander 2020-05-29 09:39:17 +01:00
parent 49498fb794
commit 4fda6c65e6
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clientapi/routing/sendtodevice.go
View file

@ -22,6 +22,7 @@ import (
"github.com/matrix-org/dendrite/clientapi/producers" "github.com/matrix-org/dendrite/clientapi/producers"
"github.com/matrix-org/dendrite/internal/transactions" "github.com/matrix-org/dendrite/internal/transactions"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/sirupsen/logrus"
) )
// SendToDevice handles PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId} // SendToDevice handles PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}
@ -55,6 +56,14 @@ func SendToDevice(
); err != nil { ); err != nil {
util.GetLogger(req.Context()).WithError(err).Error("eduProducer.SendToDevice failed") util.GetLogger(req.Context()).WithError(err).Error("eduProducer.SendToDevice failed")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} else {
util.GetLogger(req.Context()).WithFields(logrus.Fields{
"sender": device.UserID,
"user_id": userID,
"device_id": deviceID,
"event_type": eventType,
"message": string(message),
}).Info("client API processed send-to-device message")
} }
} }
} }

4
syncapi/consumers/eduserver_sendtodevice.go
View file

@ -79,10 +79,12 @@ func (s *OutputSendToDeviceEventConsumer) onMessage(msg *sarama.ConsumerMessage)
} }
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"sender": output.Sender,
"user_id": output.UserID, "user_id": output.UserID,
"device_id": output.DeviceID, "device_id": output.DeviceID,
"event_type": output.Type, "event_type": output.Type,
}).Debug("received send-to-device event from EDU server") "content": string(output.Content),
}).Debug("sync API received send-to-device event from EDU server")
newPos, err := s.db.StoreNewSendForDeviceMessage( newPos, err := s.db.StoreNewSendForDeviceMessage(
context.TODO(), output.UserID, output.DeviceID, output.SendToDeviceEvent, context.TODO(), output.UserID, output.DeviceID, output.SendToDeviceEvent,

4
syncapi/storage/shared/syncserver.go
View file

@ -1031,7 +1031,7 @@ func (d *Database) currentStateStreamEventsForRoom(
func (d *Database) AddSendToDeviceEvent( func (d *Database) AddSendToDeviceEvent(
ctx context.Context, txn *sql.Tx, ctx context.Context, txn *sql.Tx,
userID, deviceID, eventType, content string, userID, deviceID, content string,
) error { ) error {
return d.SendToDevice.InsertSendToDeviceMessage( return d.SendToDevice.InsertSendToDeviceMessage(
ctx, txn, userID, deviceID, content, ctx, txn, userID, deviceID, content,
@ -1042,7 +1042,7 @@ func (d *Database) StoreNewSendForDeviceMessage(
ctx context.Context, userID, deviceID string, event gomatrixserverlib.SendToDeviceEvent, ctx context.Context, userID, deviceID string, event gomatrixserverlib.SendToDeviceEvent,
) (types.StreamPosition, error) { ) (types.StreamPosition, error) {
err := d.AddSendToDeviceEvent( err := d.AddSendToDeviceEvent(
ctx, nil, userID, deviceID, event.Type, string(event.Content), ctx, nil, userID, deviceID, string(event.Content),
) )
if err != nil { if err != nil {
return 0, err return 0, err