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.

Sign up for GitHub

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

Write balancer port on base-uri #751

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Write balancer port on base-uri #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions kafka-rest/src/main/java/io/confluent/kafkarest/KafkaRestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ public class KafkaRestConfig extends RestConfig {
+ " hostname is used";
public static final String HOST_NAME_DEFAULT = "";

public static final String HOST_PORT_CONFIG = "host.port";
private static final String HOST_PORT_DOC =
"The host port used to generate absolute URLs in responses. If empty, the default canonical"
+ " port is used";
public static final String HOST_PORT_DEFAULT = "-1";

public static final String ADVERTISED_LISTENERS_CONFIG = "advertised.listeners";
protected static final String ADVERTISED_LISTENERS_DOC =
"List of advertised listeners. Used when generating absolute URLs in responses. Protocols"
Expand Down Expand Up @@ -376,6 +382,12 @@ protected static ConfigDef baseKafkaRestConfigDef() {
HOST_NAME_DEFAULT,
Importance.MEDIUM, HOST_NAME_DOC
)
.define(
HOST_PORT_CONFIG,
Type.INT,
HOST_PORT_DEFAULT,
Importance.MEDIUM, HOST_PORT_DOC
)
.define(
ADVERTISED_LISTENERS_CONFIG,
Type.LIST,
Expand Down
5 changes: 4 additions & 1 deletion kafka-rest/src/main/java/io/confluent/kafkarest/UriUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ public static UriBuilder absoluteUriBuilder(KafkaRestConfig config, UriInfo uriI
URI origAbsoluteUri = uriInfo.getAbsolutePath();
builder.scheme(origAbsoluteUri.getScheme());
// Only reset the port if it was set in the original URI
if (origAbsoluteUri.getPort() != -1) {
Integer port = config.getInt(KafkaRestConfig.HOST_PORT_CONFIG);
if (port != null && port != -1) {
builder.port(port);
} else if (origAbsoluteUri.getPort() != -1) {
try {
builder.port(config.consumerPort(origAbsoluteUri.getScheme()));
} catch (URISyntaxException e) {
Expand Down