Skip to content

Commit 8e2bed7

Browse files
committed
boot: add system env and properties as part of server options parsing process
1 parent 37ce3bc commit 8e2bed7

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,7 @@
1313
import java.nio.file.Files;
1414
import java.nio.file.Path;
1515
import java.nio.file.Paths;
16-
import java.util.ArrayList;
17-
import java.util.Arrays;
18-
import java.util.Iterator;
19-
import java.util.LinkedHashMap;
20-
import java.util.LinkedList;
21-
import java.util.List;
22-
import java.util.Locale;
23-
import java.util.Map;
24-
import java.util.Objects;
25-
import java.util.Optional;
26-
import java.util.Properties;
16+
import java.util.*;
2717
import java.util.concurrent.Executor;
2818
import java.util.concurrent.ExecutorService;
2919
import java.util.concurrent.atomic.AtomicBoolean;
@@ -1202,8 +1192,10 @@ public static void runApp(
12021192
@NonNull String[] args,
12031193
@NonNull ExecutionMode executionMode,
12041194
@NonNull List<Supplier<Jooby>> provider) {
1205-
var cmd = parseArguments(args);
1206-
var options = ServerOptions.from(ConfigFactory.parseMap(cmd)).orElse(null);
1195+
Map<String, Object> configMap = new HashMap<>(parseArguments(args));
1196+
// Override with environment
1197+
configMap.putAll(System.getenv());
1198+
var options = ServerOptions.from(ConfigFactory.parseMap(configMap)).orElse(null);
12071199
runApp(args, Server.loadServer(), options, executionMode, provider);
12081200
}
12091201

0 commit comments

Comments
 (0)