flag fix, glide update

squash

cmd/tendermint/commands/root.go

@@ -17,6 +17,9 @@ var logLevel string
 var RootCmd = &cobra.Command{
 	Use:   "tendermint",
 	Short: "Tendermint Core (BFT Consensus) in Go",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		config.Set("log_level", logLevel)
+	},
 }
 
 func init() {
@@ -26,7 +29,6 @@ func init() {
 
 	//parse flag and set config
 	RootCmd.PersistentFlags().StringVar(&logLevel, "log_level", config.GetString("log_level"), "Log level")
-	config.Set("log_level", logLevel)
 
 	// set the log level
 	logger.SetLogLevel(config.GetString("log_level"))

cmd/tendermint/commands/run_node.go

@@ -12,14 +12,14 @@ import (
 )
 
 var runNodeCmd = &cobra.Command{
-	Use:   "node",
-	Short: "Run the tendermint node",
-	Run:   runNode,
+	Use:    "node",
+	Short:  "Run the tendermint node",
+	PreRun: setConfigFlags,
+	Run:    runNode,
 }
 
 //flags
 var (
-	printHelp     bool
 	moniker       string
 	nodeLaddr     string
 	seeds         string
@@ -35,18 +35,33 @@ var (
 func init() {
 
 	// configuration options
-	RootCmd.Flags().StringVar(&moniker, "moniker", config.GetString("moniker"), "Node Name")
-	RootCmd.Flags().StringVar(&nodeLaddr, "node_laddr", config.GetString("node_laddr"), "Node listen address. (0.0.0.0:0 means any interface, any port)")
-	RootCmd.Flags().StringVar(&seeds, "seeds", config.GetString("seeds"), "Comma delimited host:port seed nodes")
-	RootCmd.Flags().BoolVar(&fastSync, "fast_sync", config.GetBool("fast_sync"), "Fast blockchain syncing")
-	RootCmd.Flags().BoolVar(&skipUPNP, "skip_upnp", config.GetBool("skip_upnp"), "Skip UPNP configuration")
-	RootCmd.Flags().StringVar(&rpcLaddr, "rpc_laddr", config.GetString("rpc_laddr"), "RPC listen address. Port required")
-	RootCmd.Flags().StringVar(&grpcLaddr, "grpc_laddr", config.GetString("grpc_laddr"), "GRPC listen address (BroadcastTx only). Port required")
-	RootCmd.Flags().StringVar(&proxyApp, "proxy_app", config.GetString("proxy_app"), "Proxy app address, or 'nilapp' or 'dummy' for local testing.")
-	RootCmd.Flags().StringVar(&abciTransport, "abci", config.GetString("abci"), "Specify abci transport (socket | grpc)")
+	runNodeCmd.Flags().StringVar(&moniker, "moniker", config.GetString("moniker"),
+		"Node Name")
+	runNodeCmd.Flags().StringVar(&nodeLaddr, "node_laddr", config.GetString("node_laddr"),
+		"Node listen address. (0.0.0.0:0 means any interface, any port)")
+	runNodeCmd.Flags().StringVar(&seeds, "seeds", config.GetString("seeds"),
+		"Comma delimited host:port seed nodes")
+	runNodeCmd.Flags().BoolVar(&fastSync, "fast_sync", config.GetBool("fast_sync"),
+		"Fast blockchain syncing")
+	runNodeCmd.Flags().BoolVar(&skipUPNP, "skip_upnp", config.GetBool("skip_upnp"),
+		"Skip UPNP configuration")
+	runNodeCmd.Flags().StringVar(&rpcLaddr, "rpc_laddr", config.GetString("rpc_laddr"),
+		"RPC listen address. Port required")
+	runNodeCmd.Flags().StringVar(&grpcLaddr, "grpc_laddr", config.GetString("grpc_laddr"),
+		"GRPC listen address (BroadcastTx only). Port required")
+	runNodeCmd.Flags().StringVar(&proxyApp, "proxy_app", config.GetString("proxy_app"),
+		"Proxy app address, or 'nilapp' or 'dummy' for local testing.")
+	runNodeCmd.Flags().StringVar(&abciTransport, "abci", config.GetString("abci"),
+		"Specify abci transport (socket | grpc)")
 
 	// feature flags
-	RootCmd.Flags().BoolVar(&pex, "pex", config.GetBool("pex_reactor"), "Enable Peer-Exchange (dev feature)")
+	runNodeCmd.Flags().BoolVar(&pex, "pex", config.GetBool("pex_reactor"),
+		"Enable Peer-Exchange (dev feature)")
+
+	RootCmd.AddCommand(runNodeCmd)
+}
+
+func setConfigFlags(cmd *cobra.Command, args []string) {
 
 	// Merge parsed flag values onto config
 	config.Set("moniker", moniker)
@@ -59,8 +74,6 @@ func init() {
 	config.Set("proxy_app", proxyApp)
 	config.Set("abci", abciTransport)
 	config.Set("pex_reactor", pex)
-
-	RootCmd.AddCommand(runNodeCmd)
 }
 
 // Users wishing to:

cmd/tendermint/main.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	cmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
+	"github.com/tendermint/tendermint/cmd/tendermint/commands"
 )
 
 func main() {
-	if err := cmd.RootCmd.Execute(); err != nil {
+	if err := commands.RootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}

glide.lock

@@ -39,6 +39,8 @@ imports:
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
   subpackages:
   - difflib
+- name: github.com/spf13/cobra
+  version: 92ea23a837e66f46ac9e7d04fa826602b7b0a42d
 - name: github.com/spf13/pflag
   version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
 - name: github.com/stretchr/testify

glide.yaml

@@ -1,4 +1,4 @@
-package: github.com/tendermint/tendermint
+eackage: github.com/tendermint/tendermint
 import:
 - package: github.com/tendermint/go-autofile
   version: develop
@@ -39,6 +39,7 @@ import:
   - proto
 - package: github.com/gorilla/websocket
   version: ^1.1.0
+- package: github.com/spf13/cobra
 - package: github.com/spf13/pflag
 - package: github.com/pkg/errors
   version: ^0.8.0