diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-14 10:18:54 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-14 10:18:54 +0100 |
| commit | 9a1638ed21ea716b999853c8d63c30073e677c46 (patch) | |
| tree | 60c79cacb7e6b0df578141fc6b4c1a111f983686 /synapse/app/homeserver.py | |
| parent | Make federation use resource_for_federation as well. (diff) | |
| download | synapse-9a1638ed21ea716b999853c8d63c30073e677c46.tar.xz | |
Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index d9494cb054..ea6f0985ef 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -24,7 +24,7 @@ from twisted.python.log import PythonLoggingObserver from twisted.web.resource import Resource from twisted.web.static import File from twisted.web.server import Site -from synapse.http.server import TwistedHttpServer, JsonResource +from synapse.http.server import JsonResource from synapse.http.client import TwistedHttpClient from synapse.rest.base import CLIENT_PREFIX from synapse.federation.transport import PREFIX @@ -40,8 +40,6 @@ logger = logging.getLogger(__name__) class SynapseHomeServer(HomeServer): - def build_http_server(self): - return TwistedHttpServer() def build_http_client(self): return TwistedHttpClient() |