Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from matrix-org/erikj/timed_otu 

Use SynapseError 504 for Timeout errors
This commit is contained in:
Erik Johnston 2016-04-15 10:31:17 +01:00
parent 3c79bdd7a0 cb9c465707
commit 737aee9295
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/util/__init__.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.api.errors import SynapseError
from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logcontext import PreserveLoggingContext
from twisted.internet import defer, reactor, task from twisted.internet import defer, reactor, task
@ -80,7 +81,7 @@ class Clock(object):
def timed_out_fn(): def timed_out_fn():
try: try:
ret_deferred.errback(RuntimeError("Timed out")) ret_deferred.errback(SynapseError(504, "Timed out"))
except: except:
pass pass