diff options
Diffstat (limited to 'cmd/swarm/config.go')
| -rw-r--r-- | cmd/swarm/config.go | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 33235ca06..9931b12a2 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -23,6 +23,7 @@ import ( "os" "reflect" "strconv" + "strings" "unicode" cli "gopkg.in/urfave/cli.v1" @@ -194,12 +195,20 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con utils.Fatalf(SWARM_ERR_SWAP_SET_NO_API) } - //EnsApi can be set to "", so can't check for empty string, as it is allowed! + //EnsAPIs can be set to "", so can't check for empty string, as it is allowed! if ctx.GlobalIsSet(EnsAPIFlag.Name) { - currentConfig.EnsApi = ctx.GlobalString(EnsAPIFlag.Name) + ensAPIs := ctx.GlobalStringSlice(EnsAPIFlag.Name) + // Disable ENS resolver if --ens-api="" is specified + if len(ensAPIs) == 1 && ensAPIs[0] == "" { + currentConfig.EnsDisabled = true + currentConfig.EnsAPIs = nil + } else { + currentConfig.EnsDisabled = false + currentConfig.EnsAPIs = ensAPIs + } } - if ensaddr := ctx.GlobalString(EnsAddrFlag.Name); ensaddr != "" { + if ensaddr := ctx.GlobalString(DeprecatedEnsAddrFlag.Name); ensaddr != "" { currentConfig.EnsRoot = common.HexToAddress(ensaddr) } @@ -266,9 +275,17 @@ func envVarsOverride(currentConfig *bzzapi.Config) (config *bzzapi.Config) { utils.Fatalf(SWARM_ERR_SWAP_SET_NO_API) } - //EnsApi can be set to "", so can't check for empty string, as it is allowed + //EnsAPIs can be set to "", so can't check for empty string, as it is allowed if ensapi, exists := os.LookupEnv(SWARM_ENV_ENS_API); exists { - currentConfig.EnsApi = ensapi + ensAPIs := strings.Split(ensapi, ",") + // Disable ENS resolver if SWARM_ENS_API="" is specified + if len(ensAPIs) == 0 { + currentConfig.EnsDisabled = true + currentConfig.EnsAPIs = nil + } else { + currentConfig.EnsDisabled = false + currentConfig.EnsAPIs = ensAPIs + } } if ensaddr := os.Getenv(SWARM_ENV_ENS_ADDR); ensaddr != "" { @@ -309,6 +326,10 @@ func checkDeprecated(ctx *cli.Context) { if ctx.GlobalString(DeprecatedEthAPIFlag.Name) != "" { utils.Fatalf("--ethapi is no longer a valid command line flag, please use --ens-api and/or --swap-api.") } + // warn if --ens-api flag is set + if ctx.GlobalString(DeprecatedEnsAddrFlag.Name) != "" { + log.Warn("--ens-addr is no longer a valid command line flag, please use --ens-api to specify contract address.") + } } //print a Config as string |