Merge together redundant calculations/logging

matrix-org · May 3, 2017 · ef86218 · ef86218
1 parent 2347efc
commit ef86218
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -175,14 +175,9 @@ def on_receive_pdu(self, origin, pdu, get_missing=True):
                         # Update the set of things we've seen after trying to
                         # fetch the missing stuff
                         have_seen = yield self.store.have_events(prevs)
-
                         seen = set(have_seen.iterkeys())
-                        if prevs - seen:
-                            logger.info(
-                                "Still missing %d prev events for %s: %r...",
-                                len(prevs - seen), pdu.event_id, list(prevs - seen)[:5]
-                            )
-                        else:
+
+                        if not prevs - seen:
                             logger.info(
                                 "Found all missing prev events for %s", pdu.event_id
                             )
@@ -193,8 +188,6 @@ def on_receive_pdu(self, origin, pdu, get_missing=True):
                         list(prevs - seen)[:5],
                     )
 
-            prevs = {e_id for e_id, _ in pdu.prev_events}
-            seen = set(have_seen.keys())
             if prevs - seen:
                 logger.info(
                     "Still missing %d events for room %r: %r...",