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/federation_sender.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/federation_sender.py')
-rw-r--r-- | synapse/app/federation_sender.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index 97da7bdcbf..fec49d5092 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -28,9 +28,8 @@ from synapse.config.logger import setup_logging from synapse.federation import send_queue from synapse.http.site import SynapseSite from synapse.logging.context import LoggingContext, run_in_background -from synapse.metrics import RegistryProxy +from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy from synapse.metrics.background_process_metrics import run_as_background_process -from synapse.metrics.resource import METRICS_PREFIX, MetricsResource from synapse.replication.slave.storage.deviceinbox import SlavedDeviceInboxStore from synapse.replication.slave.storage.devices import SlavedDeviceStore from synapse.replication.slave.storage.events import SlavedEventStore |