diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-18 23:57:15 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 23:57:15 +1000 |
| commit | 7ad1d763566eb34bd32234811aa9901d8f3668aa (patch) | |
| tree | 2349489f45b024f7b5430f6405687c1c36bedc33 /synapse/app/frontend_proxy.py | |
| parent | Remove the ability to query relations when the original event was redacted. (... (diff) | |
| download | synapse-7ad1d763566eb34bd32234811aa9901d8f3668aa.tar.xz | |
Support Prometheus_client 0.4.0+ (#5636)
Diffstat (limited to 'synapse/app/frontend_proxy.py')
| -rw-r--r-- | synapse/app/frontend_proxy.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index 417a10bbd2..1f1f1df78e 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -30,8 +30,7 @@ from synapse.http.server import JsonResource from synapse.http.servlet import RestServlet, parse_json_object_from_request from synapse.http.site import SynapseSite from synapse.logging.context import LoggingContext -from synapse.metrics import RegistryProxy -from synapse.metrics.resource import METRICS_PREFIX, MetricsResource +from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.client_ips import SlavedClientIpStore |