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

Fix issue with runtime config being consumed at build time #3715

Merged
merged 1 commit into from
Aug 27, 2019
Merged

Fix issue with runtime config being consumed at build time #3715

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: 9 additions & 3 deletions ...vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import javax.inject.Singleton;

import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.DotName;
import org.jboss.jandex.MethodInfo;
Expand All @@ -34,6 +35,7 @@
import io.quarkus.arc.processor.BuildExtension;
import io.quarkus.arc.processor.BuiltinScope;
import io.quarkus.arc.processor.DotNames;
import io.quarkus.deployment.IsNormal;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
Expand Down Expand Up @@ -90,9 +92,13 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FeatureBuildItem.VERTX_WEB);
}

@BuildStep
public void kubernetes(HttpConfiguration config, BuildProducer<KubernetesPortBuildItem> portProducer) {
portProducer.produce(new KubernetesPortBuildItem(config.port, "http"));
@BuildStep(onlyIf = IsNormal.class)
@Record(value = ExecutionTime.RUNTIME_INIT, optional = true)
public KubernetesPortBuildItem kubernetes(HttpConfiguration config, BuildProducer<KubernetesPortBuildItem> portProducer,
VertxWebRecorder recorder) {
int port = ConfigProvider.getConfig().getOptionalValue("quarkus.http.port", Integer.class).orElse(8080);
recorder.warnIfPortChanged(config, port);
return new KubernetesPortBuildItem(config.port, "http");
}

@BuildStep
Expand Down
8 changes: 8 additions & 0 deletions ...nsions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/VertxWebRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,14 @@ private Handler<RoutingContext> createHandler(String handlerClassName) {
}
}

public void warnIfPortChanged(HttpConfiguration config, int port) {
if (config.port != port) {
LOGGER.errorf(
"quarkus.http.port was specified at build time as %s however run time value is %s, Kubernetes metadata will be incorrect.",
port, config.port);
}
}

private static class WebDeploymentVerticle implements Verticle {

private final int port;
Expand Down