server: serverPort is ignored fix #3731

Author: jknack

jooby/src/main/java/io/jooby/Jooby.java

@@ -1203,8 +1203,8 @@ public static void runApp(
       @NonNull ExecutionMode executionMode,
       @NonNull List<Supplier<Jooby>> provider) {
     var cmd = parseArguments(args);
-    var options = ServerOptions.from(ConfigFactory.parseMap(cmd)).orElseGet(ServerOptions::new);
-    runApp(args, Server.loadServer(options), executionMode, provider);
+    var options = ServerOptions.from(ConfigFactory.parseMap(cmd)).orElse(null);
+    runApp(args, Server.loadServer(), options, executionMode, provider);
   }
 
   /**
@@ -1232,6 +1232,23 @@ public static void runApp(
       @NonNull Server server,
       @NonNull ExecutionMode executionMode,
       @NonNull List<Supplier<Jooby>> provider) {
+    runApp(args, server, null, executionMode, provider);
+  }
+
+  /**
+   * Setup default environment, logging (logback or log4j2) and run application.
+   *
+   * @param args Application arguments.
+   * @param server Server.
+   * @param executionMode Default application execution mode. Can be overridden by application.
+   * @param provider Application provider.
+   */
+  private static void runApp(
+      @NonNull String[] args,
+      @NonNull Server server,
+      @Nullable ServerOptions options,
+      @NonNull ExecutionMode executionMode,
+      @NonNull List<Supplier<Jooby>> provider) {
 
     /* Dump command line as system properties. */
     parseArguments(args).forEach(System::setProperty);
@@ -1241,13 +1258,17 @@ public static void runApp(
       for (var factory : provider) {
         var app = createApp(server, executionMode, factory);
         /*
-         When running a single app instance, there is no issue with server options, when multiple
-         apps set options a warning will be printed
+         When running a single app instance, there is no issue with server options.
+         When multiple apps pick first on the provided order.
         */
-        ServerOptions.from(app.getConfig()).ifPresent(server::setOptions);
+        if (options == null) {
+          options = ServerOptions.from(app.getConfig()).orElse(null);
+        }
         apps.add(app);
       }
-
+      if (options != null) {
+        server.setOptions(options);
+      }
       targetServer.start(apps.toArray(new Jooby[0]));
     } catch (Throwable startupError) {
       try {

jooby/src/main/java/io/jooby/ServerOptions.java

@@ -80,9 +80,9 @@ public class ServerOptions {
   public static final int IO_THREADS =
       Integer.parseInt(
           System.getProperty(
-              "server.ioThreads", Integer.toString(Runtime.getRuntime().availableProcessors())));
+              "__server_.ioThreads", Integer.toString(Runtime.getRuntime().availableProcessors())));
 
-  private static final String SERVER_NAME = System.getProperty("server.name");
+  private static final String SERVER_NAME = System.getProperty("__server_.name");
 
   /**
    * Number of worker (a.k.a application) threads. It is the number of processors multiply by <code>
@@ -91,7 +91,7 @@ public class ServerOptions {
   public static final int WORKER_THREADS =
       Integer.parseInt(
           System.getProperty(
-              "server.workerThreads",
+              "__server_.workerThreads",
               Integer.toString(Runtime.getRuntime().availableProcessors() * 8)));
 
   /** HTTP port. Default is <code>8080</code> or <code>0</code> for random port. */

modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java

@@ -53,9 +53,9 @@ public class JettyServer extends io.jooby.Server.Base {
   static {
     int cpus = ProcessorUtils.availableProcessors();
     var ioThreads = Math.max(1, Math.min(cpus / 2, THREADS / 16));
-    System.setProperty("server.ioThreads", ioThreads + "");
-    System.setProperty("server.workerThreads", THREADS + "");
-    System.setProperty("server.name", NAME);
+    System.setProperty("__server_.ioThreads", ioThreads + "");
+    System.setProperty("__server_.workerThreads", THREADS + "");
+    System.setProperty("__server_.name", NAME);
   }
 
   private OutputFactory outputFactory;

modules/jooby-netty/src/main/java/io/jooby/netty/NettyServer.java

@@ -49,7 +49,7 @@ public class NettyServer extends Server.Base {
   private static final String NAME = "netty";
 
   static {
-    System.setProperty("server.name", NAME);
+    System.setProperty("__server_.name", NAME);
   }
 
   private static final int _50 = 50;
@@ -88,7 +88,9 @@ public NettyServer(@NonNull ServerOptions options) {
     super.setOptions(options);
   }
 
-  public NettyServer() {}
+  public NettyServer() {
+    System.out.println("ccc");
+  }
 
   @NonNull @Override
   public OutputFactory getOutputFactory() {

modules/jooby-undertow/src/main/java/io/jooby/undertow/UndertowServer.java

@@ -46,7 +46,7 @@ public class UndertowServer extends Server.Base {
 
   static {
     // Default values
-    System.setProperty("server.name", NAME);
+    System.setProperty("__server_.name", NAME);
   }
 
   private static final int BACKLOG = 8192;