Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHE-1787: Remove workspace id from websocket connection path to master #2907

Merged
merged 4 commits into from
Oct 31, 2016

Conversation

vinokurig
Copy link
Contributor

@vinokurig vinokurig commented Oct 27, 2016

What does this PR do?

Removes workspace id from websocket connection path to master.

What issues does this PR fix or reference?

#1787

Previous behavior

Separate web-socket connection was created for each workspase.

New behavior

All workspaces are using one web-socket connection.

@vparfonov @akurinnoy @ashumilova Please review

@codenvy-ci
Copy link

Build # 809 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/809/ to view the results.

getBus(workspaceId) {
var currentBus = this.sockets.get(workspaceId);
if (!currentBus) {
getBus() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this kind of change needs to be applied on getRemoteBus as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -23,7 +23,7 @@
</context-param>
<context-param>
<param-name>org.eclipse.che.websocket.endpoint</param-name>
<param-value>/ws/{ws-id}</param-value>
<param-value>/ws</param-value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we have http redirect from /ws/ to /ws ?
for backward compliance for existing clients ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a network issue. This needs investigation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Contributor

@benoitf benoitf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except the fact that I would want to have a redirect from /ws/ to /ws for any existing clients, ok for me

@codenvy-ci
Copy link

Build # 817 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/817/ to view the results.

@vinokurig vinokurig changed the title CHE-1878: Remove workspace id from websocket connection path to master CHE-1787: Remove workspace id from websocket connection path to master Oct 31, 2016
@vinokurig vinokurig merged commit bfcc846 into master Oct 31, 2016
@vinokurig vinokurig deleted the Websocket branch October 31, 2016 14:24
@codenvy-ci
Copy link

Build # 857 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/857/ to view the results.

@vinokurig
Copy link
Contributor Author

@benoitf Thank you, I will fix that.

@benoitf
Copy link
Contributor

benoitf commented Nov 2, 2016

@vinokurig I've found another location, I will provide PR to fix it

@vinokurig
Copy link
Contributor Author

@benoitf ok, thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants