diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
| commit | 79f34bdbc2720a832cdab36ba58e83201e549c41 (patch) | |
| tree | 2bdadb2bd2d2dac1a6722c4d33ca81febb7d7ece /synapse/app/homeserver.py | |
| parent | Fix typo (diff) | |
| parent | jenkins.sh: set -x (diff) | |
| download | synapse-79f34bdbc2720a832cdab36ba58e83201e549c41.tar.xz | |
Merge branch 'develop' into rav/SYN-642
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 2b4be7bdd0..de5ee988f1 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -63,6 +63,7 @@ from synapse.config.homeserver import HomeServerConfig from synapse.crypto import context_factory from synapse.util.logcontext import LoggingContext from synapse.metrics.resource import MetricsResource, METRICS_PREFIX +from synapse.replication.resource import ReplicationResource, REPLICATION_PREFIX from synapse.federation.transport.server import TransportLayerServer from synapse import events @@ -169,6 +170,9 @@ class SynapseHomeServer(HomeServer): if name == "metrics" and self.get_config().enable_metrics: resources[METRICS_PREFIX] = MetricsResource(self) + if name == "replication": + resources[REPLICATION_PREFIX] = ReplicationResource(self) + root_resource = create_resource_tree(resources) if tls: reactor.listenSSL( |