gopkg/logrus
2
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of https://github.com/dclendenan/logrus

Browse Source
This commit is contained in:
Dave Clendenan
2017-08-30 15:43:36 -07:00
parent eab1019f63 e3d17767d1
commit 40f571805d
7 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json_formatter.go
+2 -4
View File
@@ -40,12 +40,10 @@ type JSONFormatter struct {
// FieldMap: FieldMap{
// FieldKeyTime: "@timestamp",
// FieldKeyLevel: "@level",
<<<<<<< HEAD
// FieldKeyMsg: "@message",
// FieldKeyFunc: "@caller",
=======
// FieldKeyMsg: "@message",
>>>>>>> 89742aefa4b206dcf400792f3bd35b542998eb3b
// FieldKeyMsg: "@message",
// FieldKeyFunc: "@caller",
// },
// }
FieldMap FieldMap