Replace x/net/websocket with gorilla/websocket. #7013
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
wallyworld
approved these changes
Feb 21, 2017
rpc/server.go
Outdated
| @@ -341,13 +341,15 @@ func (conn *Conn) input() { | |||
| close(conn.dead) | |||
| } | |||
|
|
|||
| var errRemoteClosed = errors.New("remote closed connection") | |||
| // sendInitialErrorV0 writes out the error as a params.ErrorResult serialized | ||
| // with JSON with a new line character at the end. | ||
| // | ||
| // This is a hangover from the initial debug-log streaming endoing where the |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
added a commit
that referenced
this pull request
Feb 23, 2017
Revert "Merge pull request #7013 from howbazaar/gorilla-websocket" ## Description of change This reverts commit f06c3e9, reversing changes made to 3c535e6. ## Please provide the following details to expedite Pull Request review: The Gorilla websockets change broke restore-backup The bootstrap under proxied conditions is also broken, ## QA steps We expect juju to bootstrap under proxied conditions and restore-backup to work again. ## Documentation changes None ## Bug reference https://bugs.launchpad.net/juju/+bug/1666898
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.
There was a tech-board decision some time in the last two years when we were discussing websocket libraries and why we had two. The decision then was to standardise on gorilla/websocket, but nothing happened.
I'm hoping that using the more standards compliant websocket library will help with some of the leaks we are seeing. Even if they don't help right now, the new library gives the client code access to the websocket ping/pong frames, which the old library didn't. This should allow us to have better recognition when the other end goes away.
QA steps
Deploy an old controller, make sure there are workload agents. Upgrade the controller and look at the logs. All older clients, CLI and agents should continue to work as normal. New juju CLI should work with older controller.
Documentation changes
No user impact at all.