mirror of https://github.com/rjbasitali/go-log
Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
fb74c23363 |
|
|
@ -2,14 +2,9 @@ package log
|
||||||
|
|
||||||
func (l myLogger) WithFields(fields Fields) Logger {
|
func (l myLogger) WithFields(fields Fields) Logger {
|
||||||
if l.data != nil && len(l.data) > 0 {
|
if l.data != nil && len(l.data) > 0 {
|
||||||
f := Fields{}
|
|
||||||
for k, v := range l.data {
|
|
||||||
f[k] = v
|
|
||||||
}
|
|
||||||
for k, v := range fields {
|
for k, v := range fields {
|
||||||
f[k] = v
|
l.data[k] = v
|
||||||
}
|
}
|
||||||
l.data = f
|
|
||||||
} else {
|
} else {
|
||||||
l.data = fields
|
l.data = fields
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ func (l myLogger) Prefix(p ...string) Logger {
|
||||||
var buffer strings.Builder
|
var buffer strings.Builder
|
||||||
buffer.WriteString(l.prefix)
|
buffer.WriteString(l.prefix)
|
||||||
for _, prefix := range p {
|
for _, prefix := range p {
|
||||||
buffer.WriteString(fmt.Sprintf("%s ", prefix))
|
buffer.WriteString(fmt.Sprintf("%s: ", prefix))
|
||||||
}
|
}
|
||||||
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: buffer.String(), data: l.data}
|
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: buffer.String(), data: l.data}
|
||||||
return logger
|
return logger
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ func (l myLogger) log(flag uint8, s ...interface{}) {
|
||||||
w = l.Writer
|
w = l.Writer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
f := fmt.Sprintf("%s%s msg=%q%s", l.prefix, logPrefix(flag), fmt.Sprint(s...), l.data)
|
f := fmt.Sprintf("%s%s msg=%q%s", logPrefix(flag), l.prefix, fmt.Sprint(s...), l.data)
|
||||||
fmt.Fprintln(w, f)
|
fmt.Fprintln(w, f)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -67,7 +67,7 @@ func (l myLogger) logf(flag uint8, format string, s ...interface{}) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
format = fmt.Sprintf("%%s%%s msg=\"%s\"%s\n", format, l.data)
|
format = fmt.Sprintf("%%s%%s msg=\"%s\"%s\n", format, l.data)
|
||||||
s = append([]interface{}{l.prefix, logPrefix(flag)}, s...)
|
s = append([]interface{}{logPrefix(flag), l.prefix}, s...)
|
||||||
fmt.Fprintf(w, format, s...)
|
fmt.Fprintf(w, format, s...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue