Merge pull request #819 from lochjin/dev2.0

BUG:location trims repeat when set log level

log/log.go

@@ -76,7 +76,7 @@ func init() {
 
 	glogger.Verbosity(LvlInfo)
 
-	LocationTrims = append(LocationTrims, "github.com/Qitmeer/qng/")
+	AddLocationPrefix("github.com/Qitmeer/qng/")
 }
 
 // initLogRotator initializes the logging rotater to write logs to logFile and
@@ -116,3 +116,12 @@ func LogAndMeasureExecutionTime(log Logger, functionName string) (onEnd func())
 		log.Trace(fmt.Sprintf("%s end. Took: %s", functionName, time.Since(start)))
 	}
 }
+
+func AddLocationPrefix(prefix string) {
+	for _, pf := range LocationTrims {
+		if prefix == pf {
+			return
+		}
+	}
+	LocationTrims = append(LocationTrims, prefix)
+}

meerevm/eth/log.go

@@ -44,7 +44,7 @@ func InitLog(DebugLevel string, DebugPrintOrigins bool) {
 		agentTH.lvl = lvl
 	}
 	glogger.Verbosity(log.FromLegacyLevel(int(lvl)))
-	qlog.LocationTrims = append(qlog.LocationTrims, "github.com/ethereum/go-ethereum/")
+	qlog.AddLocationPrefix("github.com/ethereum/go-ethereum/")
 }
 
 type agentTerminalHandler struct {