Compare commits

..

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

5 changed files with 24 additions and 45 deletions

View File

@ -1,12 +1,6 @@
package log package log
func (l myLogger) WithFields(fields Fields) Logger { 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 l.data = fields
}
return l return l
} }

View File

@ -6,6 +6,6 @@ func (l myLogger) Begin(s ...interface{}) Logger {
if hasLevel(l.level, logFlag) { if hasLevel(l.level, logFlag) {
l.log(logFlag, append([]interface{}{"BEGIN"}, s...)...) 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, prefix: l.prefix, begin: time.Now(), level: l.level}
return logger return logger
} }

View File

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

View File

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

View File

@ -17,7 +17,6 @@ type Fields map[string]interface{}
type myLogger struct { type myLogger struct {
Writer io.Writer Writer io.Writer
ErrWriter io.Writer
prefix string prefix string
begin time.Time begin time.Time
level uint8 level uint8
@ -44,31 +43,21 @@ func (fields Fields) String() string {
return buffer.String() return buffer.String()
} }
func (l myLogger) log(flag uint8, s ...interface{}) { func (l myLogger) log(level uint8, s ...interface{}) {
var w io.Writer if l.Writer == nil {
{ return
if flag == errorFlag {
w = l.ErrWriter
} else {
w = l.Writer
} }
} f := fmt.Sprintf("%s%s msg=%q %s", logPrefix(level), l.prefix, fmt.Sprint(s...), l.data)
f := fmt.Sprintf("%s%s msg=%q%s", logPrefix(flag), l.prefix, fmt.Sprint(s...), l.data) fmt.Fprintln(l.Writer, f)
fmt.Fprintln(w, f)
} }
func (l myLogger) logf(flag uint8, format string, s ...interface{}) { func (l myLogger) logf(level uint8, format string, s ...interface{}) {
var w io.Writer if l.Writer == nil {
{ return
if flag == errorFlag {
w = l.ErrWriter
} else {
w = l.Writer
}
} }
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{}{logPrefix(flag), l.prefix}, s...) s = append([]interface{}{logPrefix(level), l.prefix}, s...)
fmt.Fprintf(w, format, s...) fmt.Fprintf(l.Writer, format, s...)
} }
func funcName() string { func funcName() string {
@ -88,16 +77,12 @@ func funcName() string {
return "" return ""
} }
func NewLogger(w, errw io.Writer) Logger { func NewLogger(w io.Writer) Logger {
if w == nil { if w == nil {
w = os.Stdout w = os.Stdout
} }
if errw == nil {
errw = os.Stderr
}
return myLogger{ return myLogger{
Writer: w, Writer: w,
ErrWriter: errw,
begin: time.Now(), begin: time.Now(),
level: traceFlag, level: traceFlag,
} }