diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:52:06 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:52:06 +0000 |
| commit | 907c1faf1e4655659d9a9db1615e911640b9f383 (patch) | |
| tree | e9f18d4f3044cab76ab5ae119505ea651194db5e /synapse/federation/__init__.py | |
| parent | Merge pull request #476 from koobs/patch-1 (diff) | |
| parent | Update CHANGES (diff) | |
| download | synapse-907c1faf1e4655659d9a9db1615e911640b9f383.tar.xz | |
Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse v0.13.0
Diffstat (limited to 'synapse/federation/__init__.py')
| -rw-r--r-- | synapse/federation/__init__.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/synapse/federation/__init__.py b/synapse/federation/__init__.py index 7517c529d4..979fdf2431 100644 --- a/synapse/federation/__init__.py +++ b/synapse/federation/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014, 2015 OpenMarket Ltd +# Copyright 2014-2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,15 +17,10 @@ """ from .replication import ReplicationLayer -from .transport import TransportLayer +from .transport.client import TransportLayerClient def initialize_http_replication(homeserver): - transport = TransportLayer( - homeserver, - homeserver.hostname, - server=homeserver.get_resource_for_federation(), - client=homeserver.get_http_client() - ) + transport = TransportLayerClient(homeserver) return ReplicationLayer(homeserver, transport) |