2 files changed, 17 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 0f9c82fd06..e36f0945ef 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -23,6 +23,7 @@ from synapse.api.errors import (
 from synapse.api.constants import EventTypes, Membership, RejectedReason
 from synapse.util.logutils import log_function
 from synapse.util.async import run_on_reactor
+from synapse.util.frozenutils import unfreeze
 from synapse.crypto.event_signing import (
     compute_event_signature, add_hashes_and_signatures,
 )
@@ -311,9 +312,12 @@ class FederationHandler(BaseHandler):
         self.room_queues[room_id] = []
 
         builder = self.event_builder_factory.new(
-            event.get_pdu_json()
+            unfreeze(event.get_pdu_json())
         )
 
+        logger.info("Builder: %s", builder.get_pdu_json())
+        logger.info("Content: %s", content)
+
         handled_events = set()
 
         try:
@@ -324,14 +328,21 @@ class FederationHandler(BaseHandler):
             if not hasattr(event, "signatures"):
                 builder.signatures = {}
 
+            logger.info("Content befhahs: %s", builder.content)
+
             add_hashes_and_signatures(
                 builder,
                 self.hs.hostname,
                 self.hs.config.signing_key[0],
             )
 
+            logger.info("Content aftet hah: %s", builder.content)
+            logger.info("Content pdu json: %s", builder.get_pdu_json())
+
             new_event = builder.build()
 
+            logger.info("Content after build: %s", new_event.content)
+
             # Try the host we successfully got a response to /make_join/
             # request first.
             try:
@@ -340,6 +351,7 @@ class FederationHandler(BaseHandler):
             except ValueError:
                 pass
 
+            logger.info(new_event.content)
             ret = yield self.replication_layer.send_join(
                 target_hosts,
                 new_event
@@ -485,6 +497,7 @@ class FederationHandler(BaseHandler):
 
         event.internal_metadata.outlier = False
 
+        logger.info(event.content)
         context = yield self._handle_new_event(origin, event)
 
         logger.debug(
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 0369b907a5..c685991a9f 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -403,7 +403,9 @@ class RoomMemberHandler(BaseHandler):
             "membership": Membership.JOIN,
             "content": content,
         })
+        logger.info("Before build: %s", builder.get_pdu_json())
         event, context = yield self._create_new_client_event(builder)
+        logger.info("After build: %s", event.get_dict())
 
         yield self._do_join(event, context, room_hosts=hosts, do_auth=True)
 
@@ -462,7 +464,7 @@ class RoomMemberHandler(BaseHandler):
                 room_hosts,
                 room_id,
                 event.user_id,
-                event.get_dict()["content"],  # FIXME To get a non-frozen dict
+                event.content,  # FIXME To get a non-frozen dict
                 context
             )
         else: