Compare commits

..

No commits in common. "main" and "v0.2.5" have entirely different histories.
main ... v0.2.5

5 changed files with 18 additions and 14 deletions

View File

@ -1,12 +1,6 @@
package log
func (l myLogger) WithFields(fields Fields) Logger {
if l.data != nil && len(l.data) > 0 {
for k, v := range fields {
l.data[k] = v
}
} else {
l.data = fields
}
return l
}

View File

@ -6,6 +6,6 @@ func (l myLogger) Begin(s ...interface{}) Logger {
if hasLevel(l.level, logFlag) {
l.log(logFlag, append([]interface{}{"BEGIN"}, s...)...)
}
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: time.Now(), level: l.level, data: l.data}
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: time.Now(), level: l.level}
return logger
}

View File

@ -20,7 +20,7 @@ const (
// Anything above 6 as level will be considered Level 6.
// Pass 0 to output no logs.
func (l myLogger) Level(level uint8) Logger {
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: l.begin, data: l.data}
logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: l.begin}
switch level {
case 1:
logger.level = alertFlag

View File

@ -11,6 +11,6 @@ func (l myLogger) Prefix(p ...string) Logger {
for _, prefix := range p {
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()}
return logger
}

View File

@ -47,11 +47,16 @@ func (fields Fields) String() string {
func (l myLogger) log(flag uint8, s ...interface{}) {
var w io.Writer
{
if flag == errorFlag {
w = l.ErrWriter
if flag != errorFlag && l.Writer == nil {
return
} else {
w = l.Writer
}
if flag == errorFlag && l.ErrWriter == nil {
return
} else {
w = l.ErrWriter
}
}
f := fmt.Sprintf("%s%s msg=%q%s", logPrefix(flag), l.prefix, fmt.Sprint(s...), l.data)
fmt.Fprintln(w, f)
@ -60,11 +65,16 @@ func (l myLogger) log(flag uint8, s ...interface{}) {
func (l myLogger) logf(flag uint8, format string, s ...interface{}) {
var w io.Writer
{
if flag == errorFlag {
w = l.ErrWriter
if flag != errorFlag && l.Writer == nil {
return
} else {
w = l.Writer
}
if flag == errorFlag && l.ErrWriter == nil {
return
} else {
w = l.ErrWriter
}
}
format = fmt.Sprintf("%%s%%s msg=\"%s\"%s\n", format, l.data)
s = append([]interface{}{logPrefix(flag), l.prefix}, s...)