Fix timeout error handling #716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The main issues addressed here are: 1. When renderMiddleware timesout, it will send down what ever it has left but it fails to close out the body and html. 2. In ClientController there is a race condition between nodeArrival and failArrival. nodeArrival will receive a bunch of nodes since before failArrival is sent the nodes we have left are sent down. If failArrival runs an resolves `retVal` before the nodes can actually render the `_previouslyRender` flag will be set. Once that is set and the elements try to render, because `_previouslyRender` is set at the point `_cleanup` will be called which will wipe away everything on the page.
gigabo
reviewed
Oct 14, 2016
| var elementPromisesOr = elementPromises.map((promise, index) => { | ||
| var orPromise = Q.defer(); | ||
| timeoutDfd[index] = Q.defer(); | ||
| promise.then(orPromise.resolve) |
There was a problem hiding this comment.
This needs rejection handling, too, right?
promise.catch(orPromise.reject);
gigabo
reviewed
Oct 14, 2016
| @@ -736,6 +736,8 @@ function writeBody(req, res, context, start, page) { | |||
|
|
|||
| // Let the client know it's not getting any more data. | |||
| renderScriptsAsync([{ text: `__reactServerClientController.failArrival()` }], res) | |||
| // Close off the body since the page life cycle will not complete | |||
| res.write("</div></body></html>"); | |||
There was a problem hiding this comment.
I don't think this is enough. It's addressing the symptom (we're not sending the close tags) rather than the cause (we're short-circuiting out of the normal control flow, which includes sending the close tags).
Can we handle individual element render failures without rejecting the writeBody return promise?
|
This looks good to me now. Nice work @sresant! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relates to issue #711
The main issues addressed here are:
retValbefore the nodes can actually render the_previouslyRenderflag will be set. Once that is set and the elements try to render, because_previouslyRenderis set at the point_cleanupwill be called which will wipe away everything on the page.