Merge PR #6450: Some small improve on API server
This commit is contained in:
parent
8ee7d1f403
commit
76ee9b29ac
|
@ -81,6 +81,11 @@ func (s *Server) Start(cfg config.Config) error {
|
||||||
return tmrpcserver.Serve(s.listener, s.Router, s.logger, tmCfg)
|
return tmrpcserver.Serve(s.listener, s.Router, s.logger, tmCfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Close closes the API server.
|
||||||
|
func (s *Server) Close() error {
|
||||||
|
return s.listener.Close()
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) registerSwaggerUI() {
|
func (s *Server) registerSwaggerUI() {
|
||||||
statikFS, err := fs.New()
|
statikFS, err := fs.New()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -153,6 +153,7 @@ func GetConfig() Config {
|
||||||
PrometheusRetentionTime: viper.GetInt64("telemetry.prometheus-retention-time"),
|
PrometheusRetentionTime: viper.GetInt64("telemetry.prometheus-retention-time"),
|
||||||
},
|
},
|
||||||
API: APIConfig{
|
API: APIConfig{
|
||||||
|
Enable: viper.GetBool("api.enable"),
|
||||||
Address: viper.GetString("api.address"),
|
Address: viper.GetString("api.address"),
|
||||||
MaxOpenConnections: viper.GetUint("api.max-open-connections"),
|
MaxOpenConnections: viper.GetUint("api.max-open-connections"),
|
||||||
RPCReadTimeout: viper.GetUint("api.rpc-read-timeout"),
|
RPCReadTimeout: viper.GetUint("api.rpc-read-timeout"),
|
||||||
|
|
|
@ -192,7 +192,9 @@ func startInProcess(ctx *Context, cdc codec.JSONMarshaler, appCreator AppCreator
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if viper.GetBool("api.enable") {
|
config := config.GetConfig()
|
||||||
|
var apiSrv *api.Server
|
||||||
|
if config.API.Enable {
|
||||||
genDoc, err := genDocProvider()
|
genDoc, err := genDocProvider()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -208,10 +210,10 @@ func startInProcess(ctx *Context, cdc codec.JSONMarshaler, appCreator AppCreator
|
||||||
WithClient(local.New(tmNode)).
|
WithClient(local.New(tmNode)).
|
||||||
WithTrustNode(true)
|
WithTrustNode(true)
|
||||||
|
|
||||||
apiSrv := api.New(ctx)
|
apiSrv = api.New(ctx)
|
||||||
app.RegisterAPIRoutes(apiSrv)
|
app.RegisterAPIRoutes(apiSrv)
|
||||||
|
|
||||||
if err := apiSrv.Start(config.GetConfig()); err != nil {
|
if err := apiSrv.Start(config); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -245,6 +247,10 @@ func startInProcess(ctx *Context, cdc codec.JSONMarshaler, appCreator AppCreator
|
||||||
cpuProfileCleanup()
|
cpuProfileCleanup()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if apiSrv != nil {
|
||||||
|
_ = apiSrv.Close()
|
||||||
|
}
|
||||||
|
|
||||||
ctx.Logger.Info("exiting...")
|
ctx.Logger.Info("exiting...")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue