diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
| commit | f9232c7917322de392921336b4bab5d85c213c4e (patch) | |
| tree | ab55547f1c895da508e6ac37c8056fef5b3b754e /synapse/server.py | |
| parent | Fix remaining scheduler bugs. Add more informative logging. (diff) | |
| parent | add ToC and fix typoe (diff) | |
| download | synapse-f9232c7917322de392921336b4bab5d85c213c4e.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/appservice.py
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index cb8610a1b4..c7772244ba 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -56,6 +56,7 @@ class BaseHomeServer(object): """ DEPENDENCIES = [ + 'config', 'clock', 'http_client', 'db_name', @@ -79,6 +80,7 @@ class BaseHomeServer(object): 'resource_for_server_key', 'resource_for_media_repository', 'resource_for_app_services', + 'resource_for_metrics', 'event_sources', 'ratelimiter', 'keyring', |