Skip to content

Commit 9c2c55b

Browse files
vividcoderwarku123
andcommitted
fix(config): add CLI seedNodes override in applyCLIParams
CLI seed nodes (JCommander main parameter) were not being copied to PARAMETER.seedNode after refactoring JCommander target from PARAMETER to CLIParameter. Inline loadSeeds into applyConfigParams and add seedNodes handling in applyCLIParams so CLI values properly override config file values. Co-Authored-By: Jeremy Zhang <warku123@users.noreply.github.com>
1 parent 46b00bd commit 9c2c55b

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

  • framework/src/main/java/org/tron/core/config/args

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ public static void applyConfigParams(
251251
PARAMETER.storage.setDbRoots(config);
252252

253253
PARAMETER.seedNode = new SeedNode();
254-
PARAMETER.seedNode.setAddressList(loadSeeds(config));
254+
PARAMETER.seedNode.setAddressList(
255+
getInetSocketAddress(config, ConfigKey.SEED_NODE_IP_LIST, false));
255256

256257
if (config.hasPath(ConfigKey.GENESIS_BLOCK)) {
257258
PARAMETER.genesisBlock = new GenesisBlock();
@@ -1087,6 +1088,13 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
10871088
if (assigned.containsKey("--log-config")) {
10881089
PARAMETER.logbackPath = cmd.logbackPath;
10891090
}
1091+
if (!cmd.seedNodes.isEmpty()) {
1092+
List<InetSocketAddress> seeds = new ArrayList<>();
1093+
for (String s : cmd.seedNodes) {
1094+
seeds.add(NetUtil.parseInetSocketAddress(s));
1095+
}
1096+
PARAMETER.seedNode.setAddressList(seeds);
1097+
}
10901098
}
10911099

10921100
private static void initLocalWitnesses(Config config, CLIParameter cmd) {
@@ -1312,19 +1320,6 @@ private static EventPluginConfig getEventPluginConfig(
13121320
return eventPluginConfig;
13131321
}
13141322

1315-
private static List<InetSocketAddress> loadSeeds(final com.typesafe.config.Config config) {
1316-
List<InetSocketAddress> inetSocketAddressList = new ArrayList<>();
1317-
if (PARAMETER.seedNodes != null && !PARAMETER.seedNodes.isEmpty()) {
1318-
for (String s : PARAMETER.seedNodes) {
1319-
InetSocketAddress inetSocketAddress = NetUtil.parseInetSocketAddress(s);
1320-
inetSocketAddressList.add(inetSocketAddress);
1321-
}
1322-
} else {
1323-
inetSocketAddressList = getInetSocketAddress(config, ConfigKey.SEED_NODE_IP_LIST, false);
1324-
}
1325-
1326-
return inetSocketAddressList;
1327-
}
13281323

13291324
public static PublishConfig loadDnsPublishConfig(final com.typesafe.config.Config config) {
13301325
PublishConfig publishConfig = new PublishConfig();

0 commit comments

Comments
 (0)