*: fix invalid key in example cfg file and support log_level from cfg file

apps/nsqadmin/main.go

@@ -93,14 +93,15 @@ func (p *program) Start() error {
 		os.Exit(0)
 	}
 
-	var cfg map[string]interface{}
+	var cfg config
 	configFile := flagSet.Lookup("config").Value.String()
 	if configFile != "" {
 		_, err := toml.DecodeFile(configFile, &cfg)
 		if err != nil {
 			logFatal("failed to load config file %s - %s", configFile, err)
 		}
 	}
+	cfg.Validate()
 
 	options.Resolve(opts, flagSet, cfg)
 	nsqadmin, err := nsqadmin.New(opts)

apps/nsqadmin/main_test.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/mreiferson/go-options"
+	"github.com/nsqio/nsq/internal/lg"
+	"github.com/nsqio/nsq/internal/test"
+	"github.com/nsqio/nsq/nsqadmin"
+)
+
+func TestConfigFlagParsing(t *testing.T) {
+	opts := nsqadmin.NewOptions()
+	opts.Logger = test.NewTestLogger(t)
+
+	flagSet := nsqadminFlagSet(opts)
+	flagSet.Parse([]string{})
+
+	cfg := config{"log_level": "debug"}
+	cfg.Validate()
+
+	options.Resolve(opts, flagSet, cfg)
+	if opts.LogLevel != lg.DEBUG {
+		t.Fatalf("log level: want debug, got %s", opts.LogLevel.String())
+	}
+}

apps/nsqadmin/options.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/nsqio/nsq/internal/lg"
+)
+
+type config map[string]interface{}
+
+// Validate settings in the config file, and fatal on errors
+func (cfg config) Validate() {
+	if v, exists := cfg["log_level"]; exists {
+		var t lg.LogLevel
+		err := t.Set(fmt.Sprintf("%v", v))
+		if err == nil {
+			cfg["log_level"] = t
+		} else {
+			logFatal("failed parsing log_level %+v", v)
+		}
+	}
+}

apps/nsqd/main_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/mreiferson/go-options"
+	"github.com/nsqio/nsq/internal/lg"
 	"github.com/nsqio/nsq/internal/test"
 	"github.com/nsqio/nsq/nsqd"
 )
@@ -25,6 +26,7 @@ func TestConfigFlagParsing(t *testing.T) {
 	}
 	defer f.Close()
 	toml.DecodeReader(f, &cfg)
+	cfg["log_level"] = "debug"
 	cfg.Validate()
 
 	options.Resolve(opts, flagSet, cfg)
@@ -33,4 +35,7 @@ func TestConfigFlagParsing(t *testing.T) {
 	if opts.TLSMinVersion != tls.VersionTLS10 {
 		t.Errorf("min %#v not expected %#v", opts.TLSMinVersion, tls.VersionTLS10)
 	}
+	if opts.LogLevel != lg.DEBUG {
+		t.Fatalf("log level: want debug, got %s", opts.LogLevel.String())
+	}
 }

apps/nsqd/options.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/nsqio/nsq/internal/app"
+	"github.com/nsqio/nsq/internal/lg"
 	"github.com/nsqio/nsq/nsqd"
 )
 
@@ -91,6 +92,15 @@ func (cfg config) Validate() {
 			logFatal("failed parsing tls_min_version %+v", v)
 		}
 	}
+	if v, exists := cfg["log_level"]; exists {
+		var t lg.LogLevel
+		err := t.Set(fmt.Sprintf("%v", v))
+		if err == nil {
+			cfg["log_level"] = t
+		} else {
+			logFatal("failed parsing log_level %+v", v)
+		}
+	}
 }
 
 func nsqdFlagSet(opts *nsqd.Options) *flag.FlagSet {

apps/nsqlookupd/main.go

@@ -68,14 +68,15 @@ func (p *program) Start() error {
 		os.Exit(0)
 	}
 
-	var cfg map[string]interface{}
+	var cfg config
 	configFile := flagSet.Lookup("config").Value.String()
 	if configFile != "" {
 		_, err := toml.DecodeFile(configFile, &cfg)
 		if err != nil {
 			logFatal("failed to load config file %s - %s", configFile, err)
 		}
 	}
+	cfg.Validate()
 
 	options.Resolve(opts, flagSet, cfg)
 	nsqlookupd, err := nsqlookupd.New(opts)

apps/nsqlookupd/main_test.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/mreiferson/go-options"
+	"github.com/nsqio/nsq/internal/lg"
+	"github.com/nsqio/nsq/internal/test"
+	"github.com/nsqio/nsq/nsqlookupd"
+)
+
+func TestConfigFlagParsing(t *testing.T) {
+	opts := nsqlookupd.NewOptions()
+	opts.Logger = test.NewTestLogger(t)
+
+	flagSet := nsqlookupdFlagSet(opts)
+	flagSet.Parse([]string{})
+
+	cfg := config{"log_level": "debug"}
+	cfg.Validate()
+
+	options.Resolve(opts, flagSet, cfg)
+	if opts.LogLevel != lg.DEBUG {
+		t.Fatalf("log level: want debug, got %s", opts.LogLevel.String())
+	}
+}

apps/nsqlookupd/options.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/nsqio/nsq/internal/lg"
+)
+
+type config map[string]interface{}
+
+// Validate settings in the config file, and fatal on errors
+func (cfg config) Validate() {
+	if v, exists := cfg["log_level"]; exists {
+		var t lg.LogLevel
+		err := t.Set(fmt.Sprintf("%v", v))
+		if err == nil {
+			cfg["log_level"] = t
+		} else {
+			logFatal("failed parsing log_level %+v", v)
+		}
+	}
+}

contrib/nsqadmin.cfg.example

@@ -1,5 +1,5 @@
 ## log verbosity level: debug, info, warn, error, or fatal
-log-level = "info"
+log_level = "info"
 
 ## <addr>:<port> to listen on for HTTP clients
 http_address = "0.0.0.0:4171"

contrib/nsqd.cfg.example

@@ -1,5 +1,5 @@
 ## log verbosity level: debug, info, warn, error, or fatal
-log-level = "info"
+log_level = "info"
 
 ## unique identifier (int) for this worker (will default to a hash of hostname)
 # id = 5150

contrib/nsqlookupd.cfg.example

@@ -1,5 +1,5 @@
 ## log verbosity level: debug, info, warn, error, or fatal
-log-level = "info"
+log_level = "info"
 
 ## <addr>:<port> to listen on for TCP clients
 tcp_address = "0.0.0.0:4160"