From 1a1fb9174d644396137f9207cfebf59df9bc7455 Mon Sep 17 00:00:00 2001 From: weiihann Date: Tue, 12 Dec 2023 14:29:31 +0800 Subject: [PATCH 1/2] cmd/utils: allow HTTPHost and WSHost flags precede --- cmd/utils/flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d4c918bf4fdb..f127787921e0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1088,7 +1088,7 @@ func SplitAndTrim(input string) (ret []string) { // setHTTP creates the HTTP RPC listener interface string from the set // command line flags, returning empty if the HTTP endpoint is disabled. func setHTTP(ctx *cli.Context, cfg *node.Config) { - if ctx.Bool(HTTPEnabledFlag.Name) && cfg.HTTPHost == "" { + if ctx.Bool(HTTPEnabledFlag.Name) { cfg.HTTPHost = "127.0.0.1" if ctx.IsSet(HTTPListenAddrFlag.Name) { cfg.HTTPHost = ctx.String(HTTPListenAddrFlag.Name) @@ -1153,7 +1153,7 @@ func setGraphQL(ctx *cli.Context, cfg *node.Config) { // setWS creates the WebSocket RPC listener interface string from the set // command line flags, returning empty if the HTTP endpoint is disabled. func setWS(ctx *cli.Context, cfg *node.Config) { - if ctx.Bool(WSEnabledFlag.Name) && cfg.WSHost == "" { + if ctx.Bool(WSEnabledFlag.Name) { cfg.WSHost = "127.0.0.1" if ctx.IsSet(WSListenAddrFlag.Name) { cfg.WSHost = ctx.String(WSListenAddrFlag.Name) From 5c0b964fd3ac5355fb27a5096af10effe39f585b Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 12 Dec 2023 13:05:43 +0100 Subject: [PATCH 2/2] Update flags.go --- cmd/utils/flags.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f127787921e0..159c47ca0191 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1089,7 +1089,9 @@ func SplitAndTrim(input string) (ret []string) { // command line flags, returning empty if the HTTP endpoint is disabled. func setHTTP(ctx *cli.Context, cfg *node.Config) { if ctx.Bool(HTTPEnabledFlag.Name) { - cfg.HTTPHost = "127.0.0.1" + if cfg.HTTPHost == "" { + cfg.HTTPHost = "127.0.0.1" + } if ctx.IsSet(HTTPListenAddrFlag.Name) { cfg.HTTPHost = ctx.String(HTTPListenAddrFlag.Name) } @@ -1154,7 +1156,9 @@ func setGraphQL(ctx *cli.Context, cfg *node.Config) { // command line flags, returning empty if the HTTP endpoint is disabled. func setWS(ctx *cli.Context, cfg *node.Config) { if ctx.Bool(WSEnabledFlag.Name) { - cfg.WSHost = "127.0.0.1" + if cfg.WSHost == "" { + cfg.WSHost = "127.0.0.1" + } if ctx.IsSet(WSListenAddrFlag.Name) { cfg.WSHost = ctx.String(WSListenAddrFlag.Name) }