Merge lp://qastaging/~blake-rouse/maas/fix-1484696 into lp://qastaging/~maas-committers/maas/trunk

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4206
Proposed branch: lp://qastaging/~blake-rouse/maas/fix-1484696
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 135 lines (+23/-18)
2 files modified
src/maasserver/static/js/angular/factories/region.js (+4/-4)
src/maasserver/static/js/angular/factories/tests/test_region.js (+19/-14)
To merge this branch: bzr merge lp://qastaging/~blake-rouse/maas/fix-1484696
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+268491@code.qastaging.launchpad.net

Commit message

Regenerate the connection URL on websocket client reconnect.

Description of the change

I am really guessing at this one. This bug is really hard to reproduce no one really knows exactly how it is happening or what is causing it.

My guess here is that the websocket can connect faster than the cookie is updated when the entire page is loaded. So it will use the old csrftoken instead of the new one. If that happens then the retry will keep using that old token. This branch changes that so the connection url is regenerated on every connect so the new csrftoken is used.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

The branch overall looks good to me. I think we can give it a try in trunk and see what happens, hoewver, please prepare a backport bracnh to 1.8 so we can test it against 1.8 too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.