diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-27 14:46:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-27 14:46:33 +0000 |
| commit | 0294fba0429a789c87f359f58218e2183ef69d96 (patch) | |
| tree | f225f8eaca5000dc143c3d2fc80225beb5eac91f | |
| parent | Change the way we get missing auth and state events (diff) | |
| download | synapse-0294fba0429a789c87f359f58218e2183ef69d96.tar.xz | |
on_receive_pdu takes more args
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0863fdb13e..27ecd35b4b 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -112,7 +112,7 @@ class FederationHandler(BaseHandler): # If we are currently in the process of joining this room, then we # queue up events for later processing. if event.room_id in self.room_queues: - self.room_queues[event.room_id].append(pdu) + self.room_queues[event.room_id].append((pdu, origin)) return logger.debug("Processing event: %s", event.event_id) @@ -401,9 +401,9 @@ class FederationHandler(BaseHandler): room_queue = self.room_queues[room_id] del self.room_queues[room_id] - for p in room_queue: + for p, origin in room_queue: try: - self.on_receive_pdu(p, backfilled=False) + self.on_receive_pdu(origin, p, backfilled=False) except: logger.exception("Couldn't handle pdu") |