From ed1d1650cb6d5186b3087061a1489b29b40ec3b1 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 30 Oct 2018 16:09:01 +0000
Subject: [PATCH 1/2] Log some bits about event creation

I found these helpful in debugging my room upgrade tests.
---
 changelog.d/4121.misc       | 1 +
 synapse/handlers/message.py | 9 ++++++---
 synapse/handlers/room.py    | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/4121.misc

diff --git a/changelog.d/4121.misc b/changelog.d/4121.misc
new file mode 100644
index 000000000000..65cffb143ce3
--- /dev/null
+++ b/changelog.d/4121.misc
@@ -0,0 +1 @@
+Log some bits about event creation
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 969e588e7383..8792d753d598 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -427,6 +427,9 @@ def send_nonmember_event(self, requester, event, context, ratelimit=True):
 
         if event.is_state():
             prev_state = yield self.deduplicate_state_event(event, context)
+            logger.info(
+                "Not bothering to persist duplicate state event %s", event.event_id,
+            )
             if prev_state is not None:
                 defer.returnValue(prev_state)
 
@@ -567,9 +570,9 @@ def create_new_client_event(self, builder, requester=None,
 
         event = builder.build()
 
-        logger.debug(
-            "Created event %s",
-            event.event_id,
+        logger.info(
+            "Created %s in %s: %s",
+            event.type, event.room_id, event.event_id,
         )
 
         defer.returnValue(
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 1d9417ff1a8d..28284ec4b6ca 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -104,6 +104,8 @@ def upgrade_room(self, requester, old_room_id, new_version):
                 creator_id=user_id, is_public=r["is_public"],
             )
 
+            logger.info("Creating new room %s to replace %s", new_room_id, old_room_id)
+
             # we create and auth the tombstone event before properly creating the new
             # room, to check our user has perms in the old room.
             tombstone_event, tombstone_context = (
@@ -544,6 +546,7 @@ def send(etype, content, **kwargs):
             content=creation_content,
         )
 
+        logger.info("Sending %s in new room", EventTypes.Member)
         yield self.room_member_handler.update_membership(
             creator,
             creator.user,

From 42b12bac3ce49ada0abd6725e0fd1b9dc1f993de Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 30 Oct 2018 19:56:54 +0000
Subject: [PATCH 2/2] Make logging a bit less noisy

---
 changelog.d/4121.misc       | 2 +-
 synapse/handlers/message.py | 6 +++---
 synapse/handlers/room.py    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog.d/4121.misc b/changelog.d/4121.misc
index 65cffb143ce3..9c29d80c3ffe 100644
--- a/changelog.d/4121.misc
+++ b/changelog.d/4121.misc
@@ -1 +1 @@
-Log some bits about event creation
+Log some bits about room creation
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 8792d753d598..a7cd779b0223 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -570,9 +570,9 @@ def create_new_client_event(self, builder, requester=None,
 
         event = builder.build()
 
-        logger.info(
-            "Created %s in %s: %s",
-            event.type, event.room_id, event.event_id,
+        logger.debug(
+            "Created event %s",
+            event.event_id,
         )
 
         defer.returnValue(
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 28284ec4b6ca..fe960342b9b2 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -524,6 +524,7 @@ def create(etype, content, **kwargs):
         @defer.inlineCallbacks
         def send(etype, content, **kwargs):
             event = create(etype, content, **kwargs)
+            logger.info("Sending %s in new room", etype)
             yield self.event_creation_handler.create_and_send_nonmember_event(
                 creator,
                 event,