diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-27 23:40:30 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 23:40:30 +1000 |
| commit | 6de3884e5e8d21860ac9c23e08a2eaa9a5df22bc (patch) | |
| tree | f6dbafff8ddc5519cb4608403b7533d9d0616ee6 | |
| parent | Merge pull request #3970 from schnuffle/develop-py3 (diff) | |
| parent | changelog (diff) | |
| download | synapse-6de3884e5e8d21860ac9c23e08a2eaa9a5df22bc.tar.xz | |
Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process
Run notify_app_services as a bg process
| -rw-r--r-- | changelog.d/3965.misc | 1 | ||||
| -rw-r--r-- | synapse/notifier.py | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelog.d/3965.misc b/changelog.d/3965.misc new file mode 100644 index 0000000000..e7e4a9c5a8 --- /dev/null +++ b/changelog.d/3965.misc @@ -0,0 +1 @@ +Run notify_app_services as a bg process diff --git a/synapse/notifier.py b/synapse/notifier.py index f1d92c1395..340b16ce25 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -24,9 +24,10 @@ from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError from synapse.handlers.presence import format_user_presence_state from synapse.metrics import LaterGauge +from synapse.metrics.background_process_metrics import run_as_background_process from synapse.types import StreamToken from synapse.util.async_helpers import ObservableDeferred, timeout_deferred -from synapse.util.logcontext import PreserveLoggingContext, run_in_background +from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function from synapse.util.metrics import Measure from synapse.visibility import filter_events_for_client @@ -248,7 +249,10 @@ class Notifier(object): def _on_new_room_event(self, event, room_stream_id, extra_users=[]): """Notify any user streams that are interested in this room event""" # poke any interested application service. - run_in_background(self._notify_app_services, room_stream_id) + run_as_background_process( + "notify_app_services", + self._notify_app_services, room_stream_id, + ) if self.federation_sender: self.federation_sender.notify_new_events(room_stream_id) |