From 4fda6c65e6913265b575e10ea41357a745e133fd Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 29 May 2020 09:39:17 +0100
Subject: [PATCH] Debug logging

---
 clientapi/routing/sendtodevice.go           | 9 +++++++++
 syncapi/consumers/eduserver_sendtodevice.go | 4 +++-
 syncapi/storage/shared/syncserver.go        | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/clientapi/routing/sendtodevice.go b/clientapi/routing/sendtodevice.go
index 45ea86c75..fad86c7aa 100644
--- a/clientapi/routing/sendtodevice.go
+++ b/clientapi/routing/sendtodevice.go
@@ -22,6 +22,7 @@ import (
 	"github.com/matrix-org/dendrite/clientapi/producers"
 	"github.com/matrix-org/dendrite/internal/transactions"
 	"github.com/matrix-org/util"
+	"github.com/sirupsen/logrus"
 )
 
 // SendToDevice handles PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}
@@ -55,6 +56,14 @@ func SendToDevice(
 			); err != nil {
 				util.GetLogger(req.Context()).WithError(err).Error("eduProducer.SendToDevice failed")
 				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")
 			}
 		}
 	}
diff --git a/syncapi/consumers/eduserver_sendtodevice.go b/syncapi/consumers/eduserver_sendtodevice.go
index d71cb1d71..cf1995e59 100644
--- a/syncapi/consumers/eduserver_sendtodevice.go
+++ b/syncapi/consumers/eduserver_sendtodevice.go
@@ -79,10 +79,12 @@ func (s *OutputSendToDeviceEventConsumer) onMessage(msg *sarama.ConsumerMessage)
 	}
 
 	log.WithFields(log.Fields{
+		"sender":     output.Sender,
 		"user_id":    output.UserID,
 		"device_id":  output.DeviceID,
 		"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(
 		context.TODO(), output.UserID, output.DeviceID, output.SendToDeviceEvent,
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index 8460aeac7..1a7a7e2c2 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -1031,7 +1031,7 @@ func (d *Database) currentStateStreamEventsForRoom(
 
 func (d *Database) AddSendToDeviceEvent(
 	ctx context.Context, txn *sql.Tx,
-	userID, deviceID, eventType, content string,
+	userID, deviceID, content string,
 ) error {
 	return d.SendToDevice.InsertSendToDeviceMessage(
 		ctx, txn, userID, deviceID, content,
@@ -1042,7 +1042,7 @@ func (d *Database) StoreNewSendForDeviceMessage(
 	ctx context.Context, userID, deviceID string, event gomatrixserverlib.SendToDeviceEvent,
 ) (types.StreamPosition, error) {
 	err := d.AddSendToDeviceEvent(
-		ctx, nil, userID, deviceID, event.Type, string(event.Content),
+		ctx, nil, userID, deviceID, string(event.Content),
 	)
 	if err != nil {
 		return 0, err