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/synchrotron.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/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index de4797fddc..315c030694 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -32,8 +32,7 @@ from synapse.handlers.presence import PresenceHandler, get_interested_parties from synapse.http.server import JsonResource from synapse.http.site import SynapseSite from synapse.logging.context import LoggingContext, run_in_background -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, __func__ from synapse.replication.slave.storage.account_data import SlavedAccountDataStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore |