Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ protected EventBusOptions getEventBusOptions(JsonObject jsonObject) {
return eventBusOptions;
}

private static final ThreadLocal<Logger> configureFromSystemProperties = new ThreadLocal<>();
protected static final ThreadLocal<Logger> configureFromSystemProperties = new ThreadLocal<>();

/**
* This is used as workaround to retain the existing behavior of the Vert.x CLI and won't be executed
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,16 @@ public void run() {
}

deploymentOptions = new DeploymentOptions();
configureFromSystemProperties(deploymentOptions, DEPLOYMENT_OPTIONS_PROP_PREFIX);
deploymentOptions.setConfig(conf).setWorker(worker).setHa(ha).setInstances(instances);
configureFromSystemProperties.set(log);
try {
configureFromSystemProperties(deploymentOptions, DEPLOYMENT_OPTIONS_PROP_PREFIX);
} finally {
configureFromSystemProperties.set(null);
}
deploymentOptions.setConfig(conf).setHa(ha).setInstances(instances);
if (worker) {
deploymentOptions.setThreadingModel(ThreadingModel.WORKER);
}
beforeDeployingVerticle(deploymentOptions);
deploy();
} else {
Expand Down
Loading