Merged
Conversation
rmars
reviewed
Sep 12, 2018
web/app/js/components/Tap.jsx
Outdated
| this.setState({ | ||
| error: { | ||
| error: `Websocket [${e.code}] ${e.reason}` | ||
| error: `Websocket close error: [${e.code}] ${e.reason ? e.reason : wsCloseCodes[e.code]}` |
There was a problem hiding this comment.
Since the websocket codes are less known that http status codes, it might be worth displaying the text all the time here, like
error: `Websocket close error [${e.code}: ${wsCloseCodes[e.code]}] ${e.reason ? ":" : ""} ${e.reason}`
web/app/js/components/Tap.jsx
Outdated
|
|
||
| const maxNumFilterOptions = 12; | ||
|
|
||
| // from https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent |
There was a problem hiding this comment.
There's similar websocket error handling in TopModule.jsx. It might be good to put this into TapUtils.jsx and then we can do the same error handling there.
The web client displays `Websocket [code]` on websocket close errors. Modify the web client to render a more helpful error message to the user. If a reason is present, render that, otherwise translate the websocket error code into a message. Fixes #1599 Signed-off-by: Andrew Seigner <[email protected]>
siggy
force-pushed
the
siggy/ws-error-strings
branch
from
2f38646 to
deb4702
Compare
zachalbert
added a commit
to zachalbert/linkerd2
that referenced
this pull request
Sep 13, 2018
* master: Update CHANGES.md for v18.9.1 release (linkerd#1631) Cleanly shutdown tap stream to data plane proxies (linkerd#1624) Change breadcrumb header to default font in styles.css (linkerd#1633) Improve top table to better cope with high RPS traffic (linkerd#1634) Add small success rate chart to table, misc web tweaks (linkerd#1628) Consolidate the source and destination columns in the Tap and Top tables (linkerd#1620) remove extraneous calc function in sidebar.css (linkerd#1632) Display more helpful websocket errors (linkerd#1626) Add breadcrumb navigation at the top of linkerd dashboard (linkerd#1613) Introduce inject check for known sidecars (linkerd#1619) Bump Prometheus to v2.4.0, Grafana to 5.2.4 (linkerd#1625) Improve performance of tap table by throttling updates (linkerd#1623) Add with-source flag to top (linkerd#1614) Conflicts: web/app/css/styles.css web/app/js/components/ResourceDetail.jsx web/app/js/index.js
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The web client displays
Websocket [code]on websocket close errors.Modify the web client to render a more helpful error message to the
user. If a reason is present, render that, otherwise translate the
websocket error code into a message.
Fixes #1599
Signed-off-by: Andrew Seigner [email protected]