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

Add -webSocket option by default when creating an inbound agent #9665

Merged
merged 2 commits into from
Aug 28, 2024

Conversation

Vlatombe
Copy link
Member

@Vlatombe Vlatombe commented Aug 27, 2024

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

  • Use websocket in the inbound agent command line sample.

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

@Vlatombe Vlatombe requested review from jglick and a team August 27, 2024 11:44
@jglick
Copy link
Member

jglick commented Aug 27, 2024

In case the inbound tcp support is disabled, the current default command doesn't work.

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.

Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

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

Thanks!

@MarkEWaite MarkEWaite added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Aug 27, 2024
if (isWebSocket()) {
sb.append("-webSocket ");
}
sb.append("-webSocket ");
Copy link
Member

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.

@MarkEWaite
Copy link
Contributor

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

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Aug 27, 2024
@MarkEWaite MarkEWaite merged commit 5df30de into jenkinsci:master Aug 28, 2024
16 checks passed
@Vlatombe Vlatombe deleted the websocket-by-default branch August 28, 2024 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants