Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Implement log/... packages with github.com/go-kit/log * Use github.com/go-kit/log/... in all the other packages
- Loading branch information
1 parent
3220134
commit 801da84
Showing
112 changed files
with
217 additions
and
3,170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,15 @@ | ||
| package log | ||
|
|
||
| import ( | ||
| "encoding" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "reflect" | ||
| ) | ||
|
|
||
| type jsonLogger struct { | ||
| io.Writer | ||
| } | ||
| "github.com/go-kit/log" | ||
| ) | ||
|
|
||
| // NewJSONLogger returns a Logger that encodes keyvals to the Writer as a | ||
| // single JSON object. Each log event produces no more than one call to | ||
| // w.Write. The passed Writer must be safe for concurrent use by multiple | ||
| // goroutines if the returned Logger will be used concurrently. | ||
| func NewJSONLogger(w io.Writer) Logger { | ||
| return &jsonLogger{w} | ||
| } | ||
|
|
||
| func (l *jsonLogger) Log(keyvals ...interface{}) error { | ||
| n := (len(keyvals) + 1) / 2 // +1 to handle case when len is odd | ||
| m := make(map[string]interface{}, n) | ||
| for i := 0; i < len(keyvals); i += 2 { | ||
| k := keyvals[i] | ||
| var v interface{} = ErrMissingValue | ||
| if i+1 < len(keyvals) { | ||
| v = keyvals[i+1] | ||
| } | ||
| merge(m, k, v) | ||
| } | ||
| enc := json.NewEncoder(l.Writer) | ||
| enc.SetEscapeHTML(false) | ||
| return enc.Encode(m) | ||
| } | ||
|
|
||
| func merge(dst map[string]interface{}, k, v interface{}) { | ||
| var key string | ||
| switch x := k.(type) { | ||
| case string: | ||
| key = x | ||
| case fmt.Stringer: | ||
| key = safeString(x) | ||
| default: | ||
| key = fmt.Sprint(x) | ||
| } | ||
|
|
||
| // We want json.Marshaler and encoding.TextMarshaller to take priority over | ||
| // err.Error() and v.String(). But json.Marshall (called later) does that by | ||
| // default so we force a no-op if it's one of those 2 case. | ||
| switch x := v.(type) { | ||
| case json.Marshaler: | ||
| case encoding.TextMarshaler: | ||
| case error: | ||
| v = safeError(x) | ||
| case fmt.Stringer: | ||
| v = safeString(x) | ||
| } | ||
|
|
||
| dst[key] = v | ||
| } | ||
|
|
||
| func safeString(str fmt.Stringer) (s string) { | ||
| defer func() { | ||
| if panicVal := recover(); panicVal != nil { | ||
| if v := reflect.ValueOf(str); v.Kind() == reflect.Ptr && v.IsNil() { | ||
| s = "NULL" | ||
| } else { | ||
| panic(panicVal) | ||
| } | ||
| } | ||
| }() | ||
| s = str.String() | ||
| return | ||
| } | ||
|
|
||
| func safeError(err error) (s interface{}) { | ||
| defer func() { | ||
| if panicVal := recover(); panicVal != nil { | ||
| if v := reflect.ValueOf(err); v.Kind() == reflect.Ptr && v.IsNil() { | ||
| s = nil | ||
| } else { | ||
| panic(panicVal) | ||
| } | ||
| } | ||
| }() | ||
| s = err.Error() | ||
| return | ||
| return log.NewJSONLogger(w) | ||
| } |
Oops, something went wrong.