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/server.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/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 537e431375..0f7ac352ae 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -55,7 +55,6 @@ class BaseHomeServer(object): DEPENDENCIES = [ 'clock', - 'http_server', 'http_client', 'db_pool', 'persistence_service', @@ -138,7 +137,9 @@ class HomeServer(BaseHomeServer): required. It still requires the following to be specified by the caller: - http_server + resource_for_client + resource_for_web_client + resource_for_federation http_client db_pool """ |