Commit 549f2910 authored by Zach Howard's avatar Zach Howard Committed by GitHub

op-conductor: fixes a few configuration bugs (#9206)

parent 590ba0a9
...@@ -109,6 +109,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*Config, error) { ...@@ -109,6 +109,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*Config, error) {
return &Config{ return &Config{
ConsensusAddr: ctx.String(flags.ConsensusAddr.Name), ConsensusAddr: ctx.String(flags.ConsensusAddr.Name),
ConsensusPort: ctx.Int(flags.ConsensusPort.Name), ConsensusPort: ctx.Int(flags.ConsensusPort.Name),
RaftBootstrap: ctx.Bool(flags.RaftBootstrap.Name),
RaftServerID: ctx.String(flags.RaftServerID.Name), RaftServerID: ctx.String(flags.RaftServerID.Name),
RaftStorageDir: ctx.String(flags.RaftStorageDir.Name), RaftStorageDir: ctx.String(flags.RaftStorageDir.Name),
NodeRPC: ctx.String(flags.NodeRPC.Name), NodeRPC: ctx.String(flags.NodeRPC.Name),
......
...@@ -28,6 +28,12 @@ var ( ...@@ -28,6 +28,12 @@ var (
EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "CONSENSUS_PORT"), EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "CONSENSUS_PORT"),
Value: 50050, Value: 50050,
} }
RaftBootstrap = &cli.BoolFlag{
Name: "raft.bootstrap",
Usage: "If this node should bootstrap a new raft cluster",
EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "RAFT_BOOTSTRAP"),
Value: false,
}
RaftServerID = &cli.StringFlag{ RaftServerID = &cli.StringFlag{
Name: "raft.server.id", Name: "raft.server.id",
Usage: "Unique ID for this server used by raft consensus", Usage: "Unique ID for this server used by raft consensus",
...@@ -90,6 +96,7 @@ var requiredFlags = []cli.Flag{ ...@@ -90,6 +96,7 @@ var requiredFlags = []cli.Flag{
NodeRPC, NodeRPC,
ExecutionRPC, ExecutionRPC,
HealthCheckInterval, HealthCheckInterval,
HealthCheckUnsafeInterval,
HealthCheckSafeInterval, HealthCheckSafeInterval,
HealthCheckMinPeerCount, HealthCheckMinPeerCount,
} }
...@@ -97,6 +104,7 @@ var requiredFlags = []cli.Flag{ ...@@ -97,6 +104,7 @@ var requiredFlags = []cli.Flag{
var optionalFlags = []cli.Flag{ var optionalFlags = []cli.Flag{
Paused, Paused,
RPCEnableProxy, RPCEnableProxy,
RaftBootstrap,
} }
func init() { func init() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment