summary refs log tree commit diff
path: root/synapse/app/federation_reader.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-07-18 23:57:15 +1000
committerGitHub <noreply@github.com>2019-07-18 23:57:15 +1000
commit7ad1d763566eb34bd32234811aa9901d8f3668aa (patch)
tree2349489f45b024f7b5430f6405687c1c36bedc33 /synapse/app/federation_reader.py
parentRemove the ability to query relations when the original event was redacted. (... (diff)
downloadsynapse-7ad1d763566eb34bd32234811aa9901d8f3668aa.tar.xz
Support Prometheus_client 0.4.0+ (#5636)
Diffstat (limited to 'synapse/app/federation_reader.py')
-rw-r--r--synapse/app/federation_reader.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py
index 11e80dbae0..76a97f8f32 100644
--- a/synapse/app/federation_reader.py
+++ b/synapse/app/federation_reader.py
@@ -29,8 +29,7 @@ from synapse.config.logger import setup_logging
 from synapse.federation.transport.server import TransportLayerServer
 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.account_data import SlavedAccountDataStore
 from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore