MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 18:43:52 +01:00
Code Issues Projects Releases Wiki Activity

Workaround for failure to wrap reason in Failure (#7473)

Browse source
This commit is contained in:
Andrew Morgan 2020-05-14 17:07:24 +01:00 committed by GitHub
parent eafd103fc7
commit 5611644519
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/7473.bugfix Normal file
View file

@ -0,0 +1 @@
Workaround for an upstream Twisted bug that caused Synapse to become unresponsive after startup.

7
synapse/http/site.py
View file

@ -15,6 +15,7 @@ import contextlib
import logging import logging
import time import time
from twisted.python.failure import Failure
from twisted.web.server import Request, Site from twisted.web.server import Request, Site
from synapse.http import redact_uri from synapse.http import redact_uri
@ -190,6 +191,12 @@ class SynapseRequest(Request):
Overrides twisted.web.server.Request.connectionLost to record the finish time and Overrides twisted.web.server.Request.connectionLost to record the finish time and
do logging. do logging.
""" """
# There is a bug in Twisted where reason is not wrapped in a Failure object
# Detect this and wrap it manually as a workaround
# More information: https://github.com/matrix-org/synapse/issues/7441
if not isinstance(reason, Failure):
reason = Failure(reason)
self.finish_time = time.time() self.finish_time = time.time()
Request.connectionLost(self, reason) Request.connectionLost(self, reason)