Deployment options set via sys props are ignored (#28)

Follows-up on eclipse-vertx/vert.x#5575

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

cli/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java

@@ -423,7 +423,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

cli/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java

@@ -15,8 +15,8 @@
 import io.vertx.core.cli.CLIException;
 import io.vertx.core.cli.CommandLine;
 import io.vertx.core.cli.annotations.*;
-import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.impl.launcher.VertxLifecycleHooks;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.spi.launcher.ExecutionContext;
 
@@ -254,8 +254,16 @@ public void run() {
       }
 
       deploymentOptions = new DeploymentOptions();
-      configureFromSystemProperties(deploymentOptions, DEPLOYMENT_OPTIONS_PROP_PREFIX);
-      deploymentOptions.setConfig(conf).setThreadingModel(worker ? ThreadingModel.WORKER : ThreadingModel.EVENT_LOOP).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 {