Allow to specify rpcAddress and metricsAddress.

This commit is contained in:
cheatfate 2020-06-29 18:42:02 +03:00 committed by zah
parent b4db2ad693
commit a6f359527d
1 changed files with 11 additions and 3 deletions

View File

@ -76,7 +76,7 @@ proc becomeValidator(validatorsDir, beaconNodeBinary, secretsDir, depositContrac
discard readLineFromStdin() discard readLineFromStdin()
proc runNode(dataDir, beaconNodeBinary, bootstrapFileOpt, depositContractOpt, proc runNode(dataDir, beaconNodeBinary, bootstrapFileOpt, depositContractOpt,
genesisFileOpt, natConfig: string, genesisFileOpt, natConfig, metricsAddress, rpcAddress: string,
basePort, nodeID, baseMetricsPort, baseRpcPort: int, basePort, nodeID, baseMetricsPort, baseRpcPort: int,
printCmdOnly: bool) = printCmdOnly: bool) =
let logLevel = getEnv("LOG_LEVEL") let logLevel = getEnv("LOG_LEVEL")
@ -107,8 +107,10 @@ proc runNode(dataDir, beaconNodeBinary, bootstrapFileOpt, depositContractOpt,
--tcp-port=""" & $(basePort + nodeID) & &""" --tcp-port=""" & $(basePort + nodeID) & &"""
--udp-port=""" & $(basePort + nodeID) & &""" --udp-port=""" & $(basePort + nodeID) & &"""
--metrics --metrics
--metrics-address={metricsAddress}
--metrics-port=""" & $(baseMetricsPort + nodeID) & &""" --metrics-port=""" & $(baseMetricsPort + nodeID) & &"""
--rpc --rpc
--rpc-address={rpcAddress}
--rpc-port=""" & $(baseRpcPort + nodeID) & &""" --rpc-port=""" & $(baseRpcPort + nodeID) & &"""
{bootstrapFileOpt} {bootstrapFileOpt}
{logLevelOpt} {logLevelOpt}
@ -136,9 +138,15 @@ cli do (skipGoerliKey {.
basePort {. basePort {.
desc: "Base TCP/UDP port (nodeID will be added to it)" .} = 9000.int, desc: "Base TCP/UDP port (nodeID will be added to it)" .} = 9000.int,
metricsAddress {.
desc: "Listening address of the metrics server" .} = "127.0.0.1",
baseMetricsPort {. baseMetricsPort {.
desc: "Base metrics port (nodeID will be added to it)" .} = 8008.int, desc: "Base metrics port (nodeID will be added to it)" .} = 8008.int,
rpcAddress {.
desc: "Listening address of the RPC server" .} = "127.0.0.1",
baseRpcPort {. baseRpcPort {.
desc: "Base rpc port (nodeID will be added to it)" .} = 9190.int, desc: "Base rpc port (nodeID will be added to it)" .} = 9190.int,
@ -257,5 +265,5 @@ cli do (skipGoerliKey {.
if doRun: if doRun:
runNode(dataDir, beaconNodeBinary, bootstrapFileOpt, depositContractOpt, runNode(dataDir, beaconNodeBinary, bootstrapFileOpt, depositContractOpt,
genesisFileOpt, natConfig, basePort, nodeID, baseMetricsPort, genesisFileOpt, natConfig, metricsAddress, rpcAddress, basePort,
baseRpcPort, printCmdOnly) nodeID, baseMetricsPort, baseRpcPort, printCmdOnly)