From f4d1331f73ccbd33a88334490d637010b1d85d78 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 2 Feb 2022 13:12:00 +0000
Subject: [PATCH] Move event ID into logger

---
 roomserver/internal/perform/perform_invite.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roomserver/internal/perform/perform_invite.go b/roomserver/internal/perform/perform_invite.go
index d064595e9..6559cd081 100644
--- a/roomserver/internal/perform/perform_invite.go
+++ b/roomserver/internal/perform/perform_invite.go
@@ -60,12 +60,12 @@ func (r *Inviter) PerformInvite(
 	isOriginLocal := event.Origin() == r.Cfg.Matrix.ServerName
 
 	logger := util.GetLogger(ctx).WithFields(map[string]interface{}{
-		"inviter": event.Sender(),
-		"invitee": *event.StateKey(),
-		"room_id": roomID,
+		"inviter":  event.Sender(),
+		"invitee":  *event.StateKey(),
+		"room_id":  roomID,
+		"event_id": event.EventID(),
 	})
 	logger.WithFields(log.Fields{
-		"event_id":         event.EventID(),
 		"room_version":     req.RoomVersion,
 		"room_info_exists": info != nil,
 		"target_local":     isTargetLocal,