diff --git a/core/kernel.go b/core/kernel.go index 4dc56ade3876f21df8f48923abe966f143b51f05..598505abe0df6df976884b1c3adeb00e6a554e05 100644 --- a/core/kernel.go +++ b/core/kernel.go @@ -113,7 +113,7 @@ func NewKernel(ctx context.Context, keyClient keys.KeyClient, privValidator tm_t launchers := []process.Launcher{ { Name: "Profiling Server", - Disabled: rpcConfig.Profiler.Disabled, + Disabled: !rpcConfig.Profiler.Enabled, Launch: func() (process.Process, error) { debugServer := &http.Server{ Addr: ":6060", @@ -172,7 +172,7 @@ func NewKernel(ctx context.Context, keyClient keys.KeyClient, privValidator tm_t }, { Name: "RPC/tm", - Disabled: rpcConfig.TM.Disabled, + Disabled: !rpcConfig.TM.Enabled, Launch: func() (process.Process, error) { listener, err := tm.StartServer(service, "/websocket", rpcConfig.TM.ListenAddress, emitter, logger) if err != nil { @@ -183,7 +183,7 @@ func NewKernel(ctx context.Context, keyClient keys.KeyClient, privValidator tm_t }, { Name: "RPC/V0", - Disabled: rpcConfig.V0.Disabled, + Disabled: !rpcConfig.V0.Enabled, Launch: func() (process.Process, error) { codec := v0.NewTCodec() jsonServer := v0.NewJSONServer(v0.NewJSONService(codec, service, logger)) @@ -203,7 +203,7 @@ func NewKernel(ctx context.Context, keyClient keys.KeyClient, privValidator tm_t }, { Name: "grpc service", - Disabled: rpcConfig.GRPC.Disabled, + Disabled: !rpcConfig.GRPC.Enabled, Launch: func() (process.Process, error) { listen, err := net.Listen("tcp", rpcConfig.GRPC.ListenAddress) if err != nil { diff --git a/rpc/config.go b/rpc/config.go index 77336e6af4d33254dd0c5b2d9bd6e4f45e1374b5..9ece9ccc3aee5606e333e23ab180f0677003a12e 100644 --- a/rpc/config.go +++ b/rpc/config.go @@ -10,22 +10,22 @@ type RPCConfig struct { } type TMConfig struct { - Disabled bool + Enabled bool ListenAddress string } type V0Config struct { - Disabled bool - Server *server.ServerConfig + Enabled bool + Server *server.ServerConfig } type ProfilerConfig struct { - Disabled bool + Enabled bool ListenAddress string } type GRPCConfig struct { - Disabled bool + Enabled bool ListenAddress string } @@ -40,25 +40,28 @@ func DefaultRPCConfig() *RPCConfig { func DefaultV0Config() *V0Config { return &V0Config{ - Server: server.DefaultServerConfig(), + Enabled: true, + Server: server.DefaultServerConfig(), } } func DefaultTMConfig() *TMConfig { return &TMConfig{ + Enabled: true, ListenAddress: "tcp://localhost:46657", } } func DefaultGRPCConfig() *GRPCConfig { return &GRPCConfig{ + Enabled: true, ListenAddress: "localhost:10997", } } func DefaultProfilerConfig() *ProfilerConfig { return &ProfilerConfig{ - Disabled: true, + Enabled: false, ListenAddress: "tcp://localhost:6060", } }