Fixed #23

log/log.go

@@ -348,68 +348,69 @@ func Panicj(j JSON) {
 }
 
 func (l *Logger) log(v Lvl, format string, args ...interface{}) {
+	if !(v >= l.level || v == 0) {
+		return
+	}
 	l.mutex.Lock()
 	defer l.mutex.Unlock()
 	buf := l.bufferPool.Get().(*bytes.Buffer)
 	buf.Reset()
 	defer l.bufferPool.Put(buf)
 	_, file, line, _ := runtime.Caller(l.skip)
 
-	if v >= l.level || v == 0 {
-		message := ""
-		if format == "" {
-			message = fmt.Sprint(args...)
-		} else if format == "json" {
-			b, err := json.Marshal(args[0])
-			if err != nil {
-				panic(err)
-			}
-			message = string(b)
-		} else {
-			message = fmt.Sprintf(format, args...)
+	message := ""
+	if format == "" {
+		message = fmt.Sprint(args...)
+	} else if format == "json" {
+		b, err := json.Marshal(args[0])
+		if err != nil {
+			panic(err)
 		}
+		message = string(b)
+	} else {
+		message = fmt.Sprintf(format, args...)
+	}
 
-		_, err := l.template.ExecuteFunc(buf, func(w io.Writer, tag string) (int, error) {
-			switch tag {
-			case "time_rfc3339":
-				return w.Write([]byte(time.Now().Format(time.RFC3339)))
-			case "time_rfc3339_nano":
-				return w.Write([]byte(time.Now().Format(time.RFC3339Nano)))
-			case "level":
-				return w.Write([]byte(l.levels[v]))
-			case "prefix":
-				return w.Write([]byte(l.prefix))
-			case "long_file":
-				return w.Write([]byte(file))
-			case "short_file":
-				return w.Write([]byte(path.Base(file)))
-			case "line":
-				return w.Write([]byte(strconv.Itoa(line)))
-			}
-			return 0, nil
-		})
-
-		if err == nil {
-			s := buf.String()
-			i := buf.Len() - 1
-			if s[i] == '}' {
-				// JSON header
-				buf.Truncate(i)
-				buf.WriteByte(',')
-				if format == "json" {
-					buf.WriteString(message[1:])
-				} else {
-					buf.WriteString(`"message":`)
-					buf.WriteString(strconv.Quote(message))
-					buf.WriteString(`}`)
-				}
+	_, err := l.template.ExecuteFunc(buf, func(w io.Writer, tag string) (int, error) {
+		switch tag {
+		case "time_rfc3339":
+			return w.Write([]byte(time.Now().Format(time.RFC3339)))
+		case "time_rfc3339_nano":
+			return w.Write([]byte(time.Now().Format(time.RFC3339Nano)))
+		case "level":
+			return w.Write([]byte(l.levels[v]))
+		case "prefix":
+			return w.Write([]byte(l.prefix))
+		case "long_file":
+			return w.Write([]byte(file))
+		case "short_file":
+			return w.Write([]byte(path.Base(file)))
+		case "line":
+			return w.Write([]byte(strconv.Itoa(line)))
+		}
+		return 0, nil
+	})
+
+	if err == nil {
+		s := buf.String()
+		i := buf.Len() - 1
+		if s[i] == '}' {
+			// JSON header
+			buf.Truncate(i)
+			buf.WriteByte(',')
+			if format == "json" {
+				buf.WriteString(message[1:])
 			} else {
-				// Text header
-				buf.WriteByte(' ')
-				buf.WriteString(message)
+				buf.WriteString(`"message":`)
+				buf.WriteString(strconv.Quote(message))
+				buf.WriteString(`}`)
 			}
-			buf.WriteByte('\n')
-			l.output.Write(buf.Bytes())
+		} else {
+			// Text header
+			buf.WriteByte(' ')
+			buf.WriteString(message)
 		}
+		buf.WriteByte('\n')
+		l.output.Write(buf.Bytes())
 	}
 }