2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py
index e662eaef10..03ea2ef14f 100644
--- a/synapse/events/builder.py
+++ b/synapse/events/builder.py
@@ -52,7 +52,7 @@ class EventBuilderFactory(object):
         i = str(self.event_id_count)
         self.event_id_count += 1
 
-        local_part = str(int(self.clock.time())) + i + random_string(5)
+        local_part = random_string(3) + str(i)
 
         e_id = EventID(local_part, self.hostname)
 
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index d278475d9a..bfd07e6615 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -132,6 +132,8 @@ def _mangle_pdu(pdu_json):
     pdu_json["auth_events"] = list(_strip_hashes(pdu_json["auth_events"]))
     pdu_json["prev_events"] = list(_strip_hashes(pdu_json["prev_events"]))
 
+    logger.info("Mangled PDU: %s", pdu_json)
+
     return pdu_json