Merge pull request #1404 from mysteriumnetwork/tk/fix-vendor-flag

Fix vendor CLI flag not being parsed

cmd/flags_node.go

@@ -19,6 +19,7 @@ package cmd
 
 import (
 	"github.com/mysteriumnetwork/node/config"
+	"github.com/mysteriumnetwork/node/config/urfavecli/cliflags"
 	"gopkg.in/urfave/cli.v1"
 	"gopkg.in/urfave/cli.v1/altsrc"
 
@@ -92,6 +93,7 @@ func RegisterFlagsNode(flags *[]cli.Flag) error {
 // ParseFlagsNode function fills in node options from CLI context
 func ParseFlagsNode(ctx *cli.Context) node.Options {
 	dirs := ParseFlagsDirectory(ctx)
+	cliflags.SetString(config.Current, config.VendorIDFlag.Name, ctx)
 	return node.Options{
 		LogOptions:  logconfig.ParseFlags(ctx, dirs.Data),
 		Directories: dirs,

config/flags.go

@@ -25,6 +25,5 @@ var (
 		Name: "vendor.id",
 		Usage: "Marks vendor (distributor) of the node for collecting statistics. " +
 			"3rd party vendors may use their own identifier here.",
-		Value: "",
 	}
 )

config/urfavecli/cliflags/flags.go

@@ -29,6 +29,8 @@ import (
 func SetString(cfg *config.Config, name string, ctx *cli.Context) {
 	if ctx.IsSet(name) {
 		cfg.SetCLI(name, ctx.String(name))
+	} else if ctx.GlobalIsSet(name) {
+		cfg.SetCLI(name, ctx.GlobalString(name))
 	} else {
 		cfg.RemoveCLI(name)
 	}
@@ -39,6 +41,8 @@ func SetString(cfg *config.Config, name string, ctx *cli.Context) {
 func SetInt(cfg *config.Config, name string, ctx *cli.Context) {
 	if ctx.IsSet(name) {
 		cfg.SetCLI(name, ctx.Int(name))
+	} else if ctx.GlobalIsSet(name) {
+		cfg.SetCLI(name, ctx.GlobalInt(name))
 	} else {
 		cfg.RemoveCLI(name)
 	}
@@ -49,6 +53,8 @@ func SetInt(cfg *config.Config, name string, ctx *cli.Context) {
 func SetBool(cfg *config.Config, name string, ctx *cli.Context) {
 	if ctx.IsSet(name) {
 		cfg.SetCLI(name, ctx.Bool(name))
+	} else if ctx.GlobalIsSet(name) {
+		cfg.SetCLI(name, ctx.GlobalBool(name))
 	} else {
 		cfg.RemoveCLI(name)
 	}

mmn/node_information.go

@@ -70,7 +70,7 @@ func CollectNodeData(client *client, resolver ip.Resolver) func(string) {
 			log.Error().Err(err).Msg("failed to send NodeInformation to MMN")
 		}
 
-		log.Info().Msg("Registered node to my.mysterium.network")
+		log.Info().Interface("info", info).Msg("Registered node to my.mysterium.network")
 	}
 }