More logging tweaks

1 files changed, 9 insertions, 5 deletions

diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go
index dfa21bcb..9d2a66d4 100644
--- a/roomserver/internal/perform/perform_join.go
+++ b/roomserver/internal/perform/perform_join.go
@@ -51,13 +51,15 @@ func (r *Joiner) PerformJoin(
 	req *rsAPI.PerformJoinRequest,
 	res *rsAPI.PerformJoinResponse,
 ) {
+	logger := logrus.WithContext(ctx).WithFields(logrus.Fields{
+		"room_id": req.RoomIDOrAlias,
+		"user_id": req.UserID,
+		"servers": req.ServerNames,
+	})
+	logger.Info("User requested to room join")
 	roomID, joinedVia, err := r.performJoin(context.Background(), req)
 	if err != nil {
-		logrus.WithContext(ctx).WithFields(logrus.Fields{
-			"room_id": req.RoomIDOrAlias,
-			"user_id": req.UserID,
-			"servers": req.ServerNames,
-		}).WithError(err).Error("Failed to join room")
+		logger.WithError(err).Error("Failed to join room")
 		sentry.CaptureException(err)
 		perr, ok := err.(*rsAPI.PerformError)
 		if ok {
@@ -67,7 +69,9 @@ func (r *Joiner) PerformJoin(
 				Msg: err.Error(),
 			}
 		}
+		return
 	}
+	logger.Info("User joined room successfully")
 	res.RoomID = roomID
 	res.JoinedVia = joinedVia
 }