fix log print by config (#165)

Author: adwpc

cmd/server/grpc/main.go

@@ -109,7 +109,7 @@ func main() {
 		os.Exit(-1)
 	}
 
-	log.Init(conf.Log.Level)
+	log.Init(conf.Log.Level, conf.Log.Fix)
 
 	log.Infof("--- Starting SFU Node ---")
 	lis, err := net.Listen("tcp", addr)

cmd/server/json-rpc/main.go

@@ -371,6 +371,7 @@ func main() {
 		showHelp()
 		os.Exit(-1)
 	}
+	log.Init(conf.Log.Level, conf.Log.Fix)
 
 	log.Infof("--- Starting SFU Node ---")
 	rpc := NewRPC()

config.toml

@@ -33,3 +33,4 @@ maxbuffertime = 1000
 [log]
 stats = true
 level = "debug"
+fix = ["proc.go", "asm_amd64.s", "jsonrpc2.go"]

pkg/log/log.go

@@ -22,13 +22,14 @@ const (
 
 // Config defines parameters for the logger
 type Config struct {
-	Level string `mapstructure:"level"`
-	Stats bool   `mapstructure:"stats"`
+	Level string   `mapstructure:"level"`
+	Stats bool     `mapstructure:"stats"`
+	Fix   []string `mapstructure:"fix"`
 }
 
 // Init initializes the package logger.
 // Supported levels are: ["debug", "info", "warn", "error"]
-func Init(level string) {
+func Init(level string, fix []string) {
 	l := zerolog.GlobalLevel()
 	switch level {
 	case "trace":
@@ -53,7 +54,13 @@ func Init(level string) {
 	output.FormatMessage = func(i interface{}) string {
 		caller, file, line, _ := runtime.Caller(9)
 		fileName := filepath.Base(file)
-		if fileName == "asm_amd64.s" || fileName == "proc.go" {
+		var needfix bool
+		for _, b := range fix {
+			if strings.Contains(fileName, b) {
+				needfix = true
+			}
+		}
+		if needfix {
 			caller, file, line, _ = runtime.Caller(8)
 			fileName = filepath.Base(file)
 		}

pkg/sfu.go

@@ -57,7 +57,7 @@ func NewSFU(c Config) *SFU {
 		receiver: c.Receiver,
 	}
 
-	log.Init(c.Log.Level)
+	log.Init(c.Log.Level, c.Log.Fix)
 
 	var icePortStart, icePortEnd uint16