summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-06-13 22:05:15 +1000
committerGitHub <noreply@github.com>2018-06-13 22:05:15 +1000
commit2a4fde0a6fa1f288f7e8c9367e3001cab00f0923 (patch)
tree5a477384e0469a3f1cea9d04d275127caee004c6 /synapse/app
parentMerge pull request #3276 from matrix-org/dbkr/unbind (diff)
parentUse the RegistryProxy for appservices too (diff)
downloadsynapse-2a4fde0a6fa1f288f7e8c9367e3001cab00f0923.tar.xz
Merge pull request #3390 from turt2live/travis/appsvc-metrics
Use the RegistryProxy for appservices too
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/appservice.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py
index dd114dee07..742fbb05c7 100644
--- a/synapse/app/appservice.py
+++ b/synapse/app/appservice.py
@@ -23,6 +23,7 @@ from synapse.config._base import ConfigError
 from synapse.config.homeserver import HomeServerConfig
 from synapse.config.logger import setup_logging
 from synapse.http.site import SynapseSite
+from synapse.metrics import RegistryProxy
 from synapse.metrics.resource import METRICS_PREFIX, MetricsResource
 from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore
 from synapse.replication.slave.storage.directory import DirectoryStore
@@ -62,7 +63,7 @@ class AppserviceServer(HomeServer):
         for res in listener_config["resources"]:
             for name in res["names"]:
                 if name == "metrics":
-                    resources[METRICS_PREFIX] = MetricsResource(self)
+                    resources[METRICS_PREFIX] = MetricsResource(RegistryProxy)
 
         root_resource = create_resource_tree(resources, NoResource())