errco: small change to trace()

gekware · Nov 24, 2022 · 2e4622f · 2e4622f
1 parent 2e4ddf9
commit 2e4622f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/errco/errco.go b/lib/errco/errco.go
@@ -41,7 +41,7 @@ const (
 // When a function fails and returns msh log using NewLog, msh log type must be TYPE_ERR or TYPE_WAR.
 // Find bad usage with reg exp: `return (.*)NewLog\((.*)TYPE_(?!ERR|WAR)`
 func NewLog(t LogTyp, l LogLvl, c LogCod, m string, a ...interface{}) *MshLog {
-	logMsh := &MshLog{trace(), t, l, c, m, a}
+	logMsh := &MshLog{trace(2), t, l, c, m, a}
 	return logMsh
 }
 
@@ -52,7 +52,7 @@ func NewLog(t LogTyp, l LogLvl, c LogCod, m string, a ...interface{}) *MshLog {
 // the parent function should handle the logging of msh log struct
 // Find bad usage with reg exp: `return (.*)NewLogln\(`
 func NewLogln(t LogTyp, l LogLvl, c LogCod, m string, a ...interface{}) *MshLog {
-	logMsh := &MshLog{trace(), t, l, c, m, a}
+	logMsh := &MshLog{trace(2), t, l, c, m, a}
 	logMsh.Log()
 	return logMsh
 }
@@ -64,7 +64,7 @@ func NewLogln(t LogTyp, l LogLvl, c LogCod, m string, a ...interface{}) *MshLog
 func (logO *MshLog) Log() *MshLog {
 	// ------- operations on original log -------
 
-	// return original log if log is nil
+	// return original log if it's nil
 	if logO == nil {
 		return logO
 	}
@@ -125,16 +125,23 @@ func (logO *MshLog) Log() *MshLog {
 
 // AddTrace adds the caller function to the msh log trace
 func (log *MshLog) AddTrace() *MshLog {
-	log.Ori = trace() + LogOri(": ") + log.Ori
+	// return original log if it's nil
+	if log == nil {
+		return log
+	}
+
+	log.Ori = trace(2) + LogOri(": ") + log.Ori
 	return log
 }
 
 // trace returns the function name the parent was called from
 //
-// aaa() -> NewLog() -> trace() = aaa
-func trace() LogOri {
-	o := "?"
-	if pc, _, _, ok := runtime.Caller(2); !ok { // 2: returns caller of caller
+// skip == 2: example() -> NewLog() -> trace()
+// result:	  example
+func trace(skip int) LogOri {
+	var o string = "?"
+
+	if pc, _, _, ok := runtime.Caller(skip); !ok {
 	} else if f := runtime.FuncForPC(pc); f == nil {
 	} else {
 		fn := f.Name()

diff --git a/lib/servctrl/servctrl-utils.go b/lib/servctrl/servctrl-utils.go
@@ -29,9 +29,9 @@ func countPlayerSafe() int {
 
 	errco.NewLogln(errco.TYPE_INF, errco.LVL_3, errco.ERROR_NIL, "retrieving player count...")
 
-	if playerCount, logMsh = getPlayersByServInfo(); logMsh.Log() == nil {
+	if playerCount, logMsh = getPlayersByServInfo(); logMsh.AddTrace().Log() == nil {
 		method = "list command"
-	} else if playerCount, logMsh = getPlayersByListCom(); logMsh.Log() == nil {
+	} else if playerCount, logMsh = getPlayersByListCom(); logMsh.AddTrace().Log() == nil {
 		method = "server info"
 	} else {
 		playerCount = servstats.Stats.PlayerCount