diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
| commit | f6583796feeff5a50c0988ce674a1ab861b14e34 (patch) | |
| tree | 47f9d5934440eef201c6ab65a0fb8df06631d18d /synapse/handlers/federation.py | |
| parent | Rearrange storage modules (diff) | |
| parent | Merge pull request #113 from matrix-org/store_rearrangement (diff) | |
| download | synapse-f6583796feeff5a50c0988ce674a1ab861b14e34.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 65cfacba2e..15ba417e06 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -290,6 +290,8 @@ class FederationHandler(BaseHandler): """ logger.debug("Joining %s to %s", joinee, room_id) + yield self.store.clean_room_for_join(room_id) + origin, pdu = yield self.replication_layer.make_join( target_hosts, room_id, |