diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-11 15:08:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 15:08:53 +0100 |
| commit | 68fd82e8403ddb6c8357a962f53bf45876d58010 (patch) | |
| tree | f3d68a61c75dbabc10a62e67c851c17b5e1f4ccd /synapse | |
| parent | Fix typo in invite to group (diff) | |
| parent | fix a logcontext leak in read receipt handling (diff) | |
| download | synapse-68fd82e8403ddb6c8357a962f53bf45876d58010.tar.xz | |
Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext
fix a logcontext leak in read receipt handling
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/receipts.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py index e1cd3a48e9..0525765272 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from synapse.util import logcontext from ._base import BaseHandler @@ -59,6 +60,8 @@ class ReceiptsHandler(BaseHandler): is_new = yield self._handle_new_receipts([receipt]) if is_new: + # fire off a process in the background to send the receipt to + # remote servers self._push_remotes([receipt]) @defer.inlineCallbacks @@ -126,6 +129,7 @@ class ReceiptsHandler(BaseHandler): defer.returnValue(True) + @logcontext.preserve_fn # caller should not yield on this @defer.inlineCallbacks def _push_remotes(self, receipts): """Given a list of receipts, works out which remote servers should be |