deps(eventlog) no need to augment Logger
allow framework to add level to log so level can be applied when using text formatter License: MIT Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
Brian Tiger Chow committed
Nov 16, 2014 at 09:51 UTC
884d629a564a745fdb8d3e6b691dfbf7254a4266
6 files changed
+5
-26
Godeps/Godeps.json
+2
-2
@@ -133,8 +133,8 @@
133
},
134
{
135
"ImportPath": "github.com/maybebtc/logrus",
136
- "Comment": "v0.6.0-7-g51cc99e",
137
- "Rev": "51cc99e4b07ec5516233a8370c28b5eedd096b6b"
136
+ "Comment": "v0.6.0-6-g005463f",
137
+ "Rev": "005463f8fb49c4a6f36181e05157e111ec5cf8a3"
138
},
139
{
140
"ImportPath": "github.com/mitchellh/go-homedir",
Godeps/_workspace/src/github.com/maybebtc/logrus/entry.go
+3
-8
@@ -71,14 +71,9 @@ func (entry *Entry) WithFields(fields Fields) *Entry {
71
}
72
73
func (entry *Entry) log(level Level, msg string) {
74
-
75
- entry.Logger.mu.Lock()
76
- if entry.Logger.WriteFields {
77
- entry.Time = time.Now()
78
- entry.Level = level
79
- entry.Message = msg
80
- }
81
- entry.Logger.mu.Unlock()
74
+ entry.Time = time.Now()
75
+ entry.Level = level
76
+ entry.Message = msg
77
78
if err := entry.Logger.Hooks.Fire(level, entry); err != nil {
79
entry.Logger.mu.Lock()
Godeps/_workspace/src/github.com/maybebtc/logrus/entry_test.go
-2
@@ -26,7 +26,6 @@ func TestEntryPanicln(t *testing.T) {
26
27
logger := New()
28
logger.Out = &bytes.Buffer{}
29
- logger.WriteFields = true
29
entry := NewEntry(logger)
30
entry.WithField("err", errBoom).Panicln("kaboom")
31
}
@@ -49,7 +48,6 @@ func TestEntryPanicf(t *testing.T) {
48
49
logger := New()
50
logger.Out = &bytes.Buffer{}
52
- logger.WriteFields = true
51
entry := NewEntry(logger)
52
entry.WithField("err", errBoom).Panicf("kaboom %v", true)
53
}
Godeps/_workspace/src/github.com/maybebtc/logrus/exported.go
-8
@@ -56,14 +56,6 @@ func WithFields(fields Fields) *Entry {
56
return std.WithFields(fields)
57
}
58
59
-// WriteFields gives the Logger permission to add time, level, msg info to
60
-// Entries
61
-func WriteFields(b bool) {
62
- std.mu.Lock()
63
- defer std.mu.Unlock()
64
- std.WriteFields = b
65
-}
66
-
59
// Debug logs a message at level Debug on the standard logger.
60
func Debug(args ...interface{}) {
61
std.Debug(args...)
Godeps/_workspace/src/github.com/maybebtc/logrus/logger.go
-5
@@ -26,11 +26,6 @@ type Logger struct {
26
// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
27
// logged. `logrus.Debug` is useful in
28
Level Level
29
-
30
- // WriteFields permits the logger to add time, msg, level data to
31
- // user-provided Fields
32
- WriteFields bool
33
-
29
// Used to sync writing to the log.
30
mu sync.Mutex
31
}
Godeps/_workspace/src/github.com/maybebtc/logrus/logrus_test.go
-1
@@ -17,7 +17,6 @@ func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fi
17
logger := New()
18
logger.Out = &buffer
19
logger.Formatter = new(JSONFormatter)
20
- logger.WriteFields = true
20
21
log(logger)
22