-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
Add -webSocket option by default when creating an inbound agent #9665
Conversation
Note that the converse could also be true but only in the relatively unusual case that you are running a non-Jetty-based servlet container. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
Outdated
Show resolved
Hide resolved
if (isWebSocket()) { | ||
sb.append("-webSocket "); | ||
} | ||
sb.append("-webSocket "); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could check for isConfigured()
before unconditionally appending this, but OTOH the most common reason for this to be considered “configured” is for WebSocket to be enabled, so in practice that would not make much difference.
This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. /label ready-for-merge |
…ties Co-authored-by: Jesse Glick <[email protected]>
This amends #8762 by making the webSocket connection method part of the connect string by default.
In case the inbound tcp support is disabled, the current default command doesn't work. So it makes more sense to make the websockets option part of the default command that is generated.
Testing done
Ran a quick build, executed the war file, and confirmed that the new default command correctly connects the agent.
Proposed changelog entries
Proposed upgrade guidelines
N/A
Submitter checklist
Desired reviewers
@mention
Before the changes are marked as
ready-for-merge
:Maintainer checklist