Merge branch 'develop'

shenli · Aug 18, 2014 · 84b3ff5 · 84b3ff5
2 parents 158e65c + a4d3cf7
commit 84b3ff5
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/cmd/mixer-proxy/main.go b/cmd/mixer-proxy/main.go
@@ -2,18 +2,18 @@ package main
 
 import (
 	"flag"
-	"strings"
+	"github.com/siddontang/go-log/log"
 	"github.com/siddontang/mixer/config"
 	"github.com/siddontang/mixer/proxy"
-	"github.com/siddontang/go-log/log"
 	"os"
 	"os/signal"
 	"runtime"
+	"strings"
 	"syscall"
 )
 
 var configFile = flag.String("config", "/etc/mixer.conf", "mixer proxy config file")
-var logLevel *string = flag.String("l", "[debug|info|warn|error]", "log level")
+var logLevel *string = flag.String("log-level", "", "log level [debug|info|warn|error], default error")
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
@@ -30,13 +30,13 @@ func main() {
 		println(err.Error())
 		return
 	}
-	
+
 	if *logLevel != "" {
 		setLogLevel(*logLevel)
 	} else {
 		setLogLevel(cfg.LogLevel)
 	}
-	
+
 	var svr *proxy.Server
 	svr, err = proxy.NewServer(cfg)
 	if err != nil {
@@ -60,12 +60,16 @@ func main() {
 	svr.Run()
 }
 
-func setLogLevel(level string){
+func setLogLevel(level string) {
 	switch strings.ToLower(level) {
-	case "debug":log.SetLevel(log.LevelDebug)
-	case "info":log.SetLevel(log.LevelInfo)
-	case "warn":log.SetLevel(log.LevelWarn)
-	case "error":log.SetLevel(log.LevelError)
+	case "debug":
+		log.SetLevel(log.LevelDebug)
+	case "info":
+		log.SetLevel(log.LevelInfo)
+	case "warn":
+		log.SetLevel(log.LevelWarn)
+	case "error":
+		log.SetLevel(log.LevelError)
 	default:
 		log.SetLevel(log.LevelError)
 	}