revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 04:42:40 +01:00
Code Issues Releases Wiki Activity

Raise PhabricatorShapedRequest request timeout

Browse source 
Summary:
We hit this very short (1s) timeout when the browser chooses to resolve all the
diff requests before the preview request. In the long term we could start the
preview request only after all the diff requests resolve, but this solves the
issue for now and there's no reason for such a short timeout.

The historical reason to have this timeout at all is that intern was megaflaky
and that's no longer a problem.

Test Plan:
Faked it so it would use a 1ms timeout the first time and then a 20s timeout;
got reasonable behavior.

Reviewed By: aran
Reviewers: jungejason, tuomaspelkonen, aran
CC: aran
Differential Revision: 329
This commit is contained in:
epriestley 2011-05-22 09:27:00 -07:00
parent 9f65a5efb8
commit 553c6c78fe
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/javelin vendored

@ -1 +1 @@
Subproject commit d9a1cb4c16866aec38f062eee9f3d2129c885b62 Subproject commit 7ac64cd03d89d6d5f8c7f85b32c9611d3866ea2b

5
webroot/rsrc/js/application/core/ShapedRequest.js
View file

@ -61,7 +61,7 @@ JX.install('PhabricatorShapedRequest', {
this._request = null; this._request = null;
})); }));
request.setData(data); request.setData(data);
request.setTimeout(this.getFrequency()); request.setTimeout(this.getRequestTimeout());
request.send(); request.send();
} else { } else {
this._defer = JX.defer( this._defer = JX.defer(
@ -87,6 +87,7 @@ JX.install('PhabricatorShapedRequest', {
properties : { properties : {
rateLimit : 500, rateLimit : 500,
frequency : 1000 frequency : 1000,
requestTimeout : 20000
} }
}); });