Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Use SynapseError 504 for Timeout errors #731

Merged
merged 1 commit into from Apr 15, 2016

Conversation

Projects
None yet
2 participants
Owner

erikjohnston commented Apr 15, 2016

No description provided.

@NegativeMjark NegativeMjark commented on the diff Apr 15, 2016

synapse/util/__init__.py
@@ -80,7 +81,7 @@ def time_bound_deferred(self, given_deferred, time_out):
def timed_out_fn():
try:
- ret_deferred.errback(RuntimeError("Timed out"))
+ ret_deferred.errback(SynapseError(504, "Timed out"))
@NegativeMjark

NegativeMjark Apr 15, 2016

Contributor

Would it be worth chucking an errcode of "M_TIMEDOUT" or something?

Contributor

NegativeMjark commented Apr 15, 2016

Otherthan maybe returning an errcode LGTM.

@erikjohnston erikjohnston merged commit 737aee9 into develop Apr 15, 2016

8 checks passed

Flake8 + Packaging (Commit) Build #432 origin/erikj/timed_otu succeeded in 30 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #421 origin/erikj/timed_otu succeeded in 5 min 57 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #427 origin/erikj/timed_otu succeeded in 4 min 36 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #476 origin/erikj/timed_otu succeeded in 1 min 7 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the erikj/timed_otu branch Dec 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment