From 20599e93f34a55f80195f1d60503e2e6e1433f8b Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 2 Aug 2023 15:01:50 +0300
Subject: [PATCH] Include room ID in portal logger

---
 portal.go | 23 ++++++++++++++---------
 user.go   |  1 -
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/portal.go b/portal.go
index 5ef72ad..31432f3 100644
--- a/portal.go
+++ b/portal.go
@@ -183,26 +183,30 @@ func (portal *Portal) GetUsers() []*User {
 	return nil
 }
 
-func (br *GMBridge) newBlankPortal(key database.Key) *Portal {
+func (portal *Portal) updateLogger() {
+	portal.zlog = portal.bridge.ZLog.With().
+		Str("portal_id", portal.ID).
+		Int("portal_receiver", portal.Receiver).
+		Str("room_id", portal.MXID.String()).
+		Logger()
+}
+
+func (br *GMBridge) NewPortal(dbPortal *database.Portal) *Portal {
 	portal := &Portal{
+		Portal: dbPortal,
+
 		bridge: br,
-		zlog:   br.ZLog.With().Str("portal_id", key.ID).Int("portal_receiver", key.Receiver).Logger(),
 
 		messages:       make(chan PortalMessage, br.Config.Bridge.PortalMessageBuffer),
 		matrixMessages: make(chan PortalMatrixMessage, br.Config.Bridge.PortalMessageBuffer),
 
 		outgoingMessages: make(map[string]*outgoingMessage),
 	}
+	portal.updateLogger()
 	go portal.handleMessageLoop()
 	return portal
 }
 
-func (br *GMBridge) NewPortal(dbPortal *database.Portal) *Portal {
-	portal := br.newBlankPortal(dbPortal.Key)
-	portal.Portal = dbPortal
-	return portal
-}
-
 const recentlyHandledLength = 100
 
 type PortalMessage struct {
@@ -1067,11 +1071,12 @@ func (portal *Portal) CreateMatrixRoom(user *User, conv *gmproto.Conversation) e
 	if err != nil {
 		return err
 	}
-	portal.zlog.Info().Str("room_id", resp.RoomID.String()).Msg("Matrix room created")
+	portal.zlog.Info().Str("new_room_id", resp.RoomID.String()).Msg("Matrix room created")
 	portal.InSpace = false
 	portal.NameSet = len(req.Name) > 0
 	portal.forwardBackfillLock.Lock()
 	portal.MXID = resp.RoomID
+	portal.updateLogger()
 	portal.bridge.portalsLock.Lock()
 	portal.bridge.portalsByMXID[portal.MXID] = portal
 	portal.bridge.portalsLock.Unlock()
diff --git a/user.go b/user.go
index 90b1a19..497cf72 100644
--- a/user.go
+++ b/user.go
@@ -802,7 +802,6 @@ func (user *User) syncConversation(v *gmproto.Conversation, source string) {
 		Str("action", "sync conversation").
 		Str("conversation_status", updateType.String()).
 		Str("data_source", source).
-		Str("room_id", portal.MXID.String()).
 		Interface("conversation_data", convCopy).
 		Logger()
 	if portal.MXID != "" {