diff options
author | Erik Johnston <erik@matrix.org> | 2021-09-28 10:37:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-28 09:37:58 +0000 |
commit | 707d5e4e48e839dabd34e4b67426fe8382a2c978 (patch) | |
tree | eb4a2a3964c9b9b5c72dad55b0248598cf5367da /synapse/push | |
parent | Sign the git tag in release script (#10925) (diff) | |
download | synapse-707d5e4e48e839dabd34e4b67426fe8382a2c978.tar.xz |
Encode JSON responses on a thread in C, mk2 (#10905)
Currently we use `JsonEncoder.iterencode` to write JSON responses, which ensures that we don't block the main reactor thread when encoding huge objects. The downside to this is that `iterencode` falls back to using a pure Python encoder that is *much* less efficient and can easily burn a lot of CPU for huge responses. To fix this, while still ensuring we don't block the reactor loop, we encode the JSON on a threadpool using the standard `JsonEncoder.encode` functions, which is backed by a C library. Doing so, however, requires `respond_with_json` to have access to the reactor, which it previously didn't. There are two ways of doing this: 1. threading through the reactor object, which is a bit fiddly as e.g. `DirectServeJsonResource` doesn't currently take a reactor, but is exposed to modules and so is a PITA to change; or 2. expose the reactor in `SynapseRequest`, which requires updating a bunch of servlet types. I went with the latter as that is just a mechanical change, and I think makes sense as a request already has a reactor associated with it (via its http channel).
Diffstat (limited to 'synapse/push')
-rw-r--r-- | synapse/push/emailpusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index e08e125cb8..cf5abdfbda 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -184,7 +184,7 @@ class EmailPusher(Pusher): should_notify_at = max(notif_ready_at, room_ready_at) - if should_notify_at < self.clock.time_msec(): + if should_notify_at <= self.clock.time_msec(): # one of our notifications is ready for sending, so we send # *one* email updating the user on their notifications, # we then consider all previously outstanding notifications |