Skip to content
Snippets Groups Projects
Commit bb159ce7 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

logger prints calling function

parent db75fb21
No related branches found
No related tags found
2 merge requests!41Resolve "Enhanced Logging",!18Develop
...@@ -103,12 +103,18 @@ func log(level Level, args ...interface{}) { ...@@ -103,12 +103,18 @@ func log(level Level, args ...interface{}) {
defer l.lock.Unlock() defer l.lock.Unlock()
if level <= l.Loglevel { if level <= l.Loglevel {
l.builder.WriteString(time.Now().Format(time.RFC3339)) l.builder.WriteString(time.Now().Format(time.RFC3339))
l.builder.WriteRune('\t')
l.builder.WriteString(prefix(level)) l.builder.WriteString(prefix(level))
file, function, line := callers() l.builder.WriteRune('\t')
l.builder.WriteString(file) function, line := callers()
functionSplitted := strings.SplitAfter(function, "/")
function = functionSplitted[len(functionSplitted) - 1]
l.builder.WriteString(function) l.builder.WriteString(function)
l.builder.WriteRune(':')
l.builder.WriteString(strconv.Itoa(line)) l.builder.WriteString(strconv.Itoa(line))
l.builder.WriteRune('\t')
l.builder.WriteString(fmt.Sprint(args...)) l.builder.WriteString(fmt.Sprint(args...))
l.builder.WriteRune('\n')
_,err := l.Out.Write([]byte(l.builder.String())) _,err := l.Out.Write([]byte(l.builder.String()))
if err != nil { if err != nil {
panic(err) panic(err)
...@@ -116,12 +122,12 @@ func log(level Level, args ...interface{}) { ...@@ -116,12 +122,12 @@ func log(level Level, args ...interface{}) {
} }
} }
func callers() (string, string, int) { func callers() (string, int) {
pc := make([]uintptr, 15) pc := make([]uintptr, 15)
n := runtime.Callers(0, pc) n := runtime.Callers(4, pc)
frames := runtime.CallersFrames(pc[:n]) frames := runtime.CallersFrames(pc[:n])
frame, _ := frames.Next() frame, _ := frames.Next()
return frame.File, frame.Function, frame.Line return frame.Function, frame.Line
} }
func prefix(level Level) string { func prefix(level Level) string {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment