diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-16 15:35:35 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-16 15:35:35 +0100 |
| commit | 33646eb000e99abd4d9174276b105a4d0f00cfef (patch) | |
| tree | 903158f9fd9ae20e1b025f3e974ec40f132fa276 /synapse/federation/transport/client.py | |
| parent | Remove unused import (diff) | |
| parent | Merge pull request #311 from matrix-org/markjh/postgres_fixes (diff) | |
| download | synapse-33646eb000e99abd4d9174276b105a4d0f00cfef.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index ced703364b..ae4195e83a 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -160,13 +160,14 @@ class TransportLayerClient(object): @defer.inlineCallbacks @log_function - def make_join(self, destination, room_id, user_id, retry_on_dns_fail=True): + def make_join(self, destination, room_id, user_id, args={}): path = PREFIX + "/make_join/%s/%s" % (room_id, user_id) content = yield self.client.get_json( destination=destination, path=path, - retry_on_dns_fail=retry_on_dns_fail, + args=args, + retry_on_dns_fail=True, ) defer.returnValue(content) |