Merge pull request #1 from rjbasitali/logfmt

Logfmt

fields.go

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

logger_begin.go

@@ -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}
+	logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: time.Now(), level: l.level, data: l.data}
 	return logger
 }

logger_level.go

@@ -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}
+	logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: l.prefix, begin: l.begin, data: l.data}
 	switch level {
 	case 1:
 		logger.level = alertFlag

logger_prefix.go

@@ -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()}
+	logger := myLogger{Writer: l.Writer, ErrWriter: l.ErrWriter, prefix: buffer.String(), data: l.data}
 	return logger
 }

my_logger.go

@@ -47,16 +47,11 @@ func (fields Fields) String() string {
 func (l myLogger) log(flag uint8, s ...interface{}) {
 	var w io.Writer
 	{
-		if flag != errorFlag && l.Writer == nil {
+		if flag == errorFlag {
-			return
+			w = l.ErrWriter
 		} 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)
@@ -65,16 +60,11 @@ 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 && l.Writer == nil {
+		if flag == errorFlag {
-			return
+			w = l.ErrWriter
 		} 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...)