Fixes build issue

remotes/r/develop
Guoqiang Chen 7 years ago
parent c3fa52df39
commit da474fcc77

@ -52,11 +52,11 @@ func (f JSONFormatter) Format(level log.Level, msg string, logger *log.Logger) [
data["line"] = line data["line"] = line
data["msg"] = msg data["msg"] = msg
line, err := marshal(data) serialized, err := marshal(data)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Failed to marshal json, %v\n", err) fmt.Fprintf(os.Stderr, "Failed to marshal json, %v\n", err)
} }
return line return serialized
} }
func marshal(v interface{}) ([]byte, error) { func marshal(v interface{}) ([]byte, error) {

@ -2,7 +2,6 @@ package formatters
import ( import (
"bytes" "bytes"
"io"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -49,7 +48,7 @@ func (f TextFormatter) Format(level log.Level, msg string, logger *log.Logger) [
f.isterm = IsTerminal(logger.Out) f.isterm = IsTerminal(logger.Out)
host, _ = os.Hostname() host, _ := os.Hostname()
f.host = []byte(host) f.host = []byte(host)
f.pid = []byte(strconv.Itoa(os.Getpid())) f.pid = []byte(strconv.Itoa(os.Getpid()))

@ -1,6 +1,9 @@
package formatters package formatters
import ( import (
"io"
"os"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
) )

Loading…
Cancel
Save