Commit 884d629a authored by Brian Tiger Chow's avatar Brian Tiger Chow

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: default avatarBrian Tiger Chow <brian@perfmode.com>
parent 356a2d7f
...@@ -133,8 +133,8 @@ ...@@ -133,8 +133,8 @@
}, },
{ {
"ImportPath": "github.com/maybebtc/logrus", "ImportPath": "github.com/maybebtc/logrus",
"Comment": "v0.6.0-7-g51cc99e", "Comment": "v0.6.0-6-g005463f",
"Rev": "51cc99e4b07ec5516233a8370c28b5eedd096b6b" "Rev": "005463f8fb49c4a6f36181e05157e111ec5cf8a3"
}, },
{ {
"ImportPath": "github.com/mitchellh/go-homedir", "ImportPath": "github.com/mitchellh/go-homedir",
......
...@@ -71,14 +71,9 @@ func (entry *Entry) WithFields(fields Fields) *Entry { ...@@ -71,14 +71,9 @@ func (entry *Entry) WithFields(fields Fields) *Entry {
} }
func (entry *Entry) log(level Level, msg string) { func (entry *Entry) log(level Level, msg string) {
entry.Time = time.Now()
entry.Logger.mu.Lock() entry.Level = level
if entry.Logger.WriteFields { entry.Message = msg
entry.Time = time.Now()
entry.Level = level
entry.Message = msg
}
entry.Logger.mu.Unlock()
if err := entry.Logger.Hooks.Fire(level, entry); err != nil { if err := entry.Logger.Hooks.Fire(level, entry); err != nil {
entry.Logger.mu.Lock() entry.Logger.mu.Lock()
......
...@@ -26,7 +26,6 @@ func TestEntryPanicln(t *testing.T) { ...@@ -26,7 +26,6 @@ func TestEntryPanicln(t *testing.T) {
logger := New() logger := New()
logger.Out = &bytes.Buffer{} logger.Out = &bytes.Buffer{}
logger.WriteFields = true
entry := NewEntry(logger) entry := NewEntry(logger)
entry.WithField("err", errBoom).Panicln("kaboom") entry.WithField("err", errBoom).Panicln("kaboom")
} }
...@@ -49,7 +48,6 @@ func TestEntryPanicf(t *testing.T) { ...@@ -49,7 +48,6 @@ func TestEntryPanicf(t *testing.T) {
logger := New() logger := New()
logger.Out = &bytes.Buffer{} logger.Out = &bytes.Buffer{}
logger.WriteFields = true
entry := NewEntry(logger) entry := NewEntry(logger)
entry.WithField("err", errBoom).Panicf("kaboom %v", true) entry.WithField("err", errBoom).Panicf("kaboom %v", true)
} }
...@@ -56,14 +56,6 @@ func WithFields(fields Fields) *Entry { ...@@ -56,14 +56,6 @@ func WithFields(fields Fields) *Entry {
return std.WithFields(fields) return std.WithFields(fields)
} }
// WriteFields gives the Logger permission to add time, level, msg info to
// Entries
func WriteFields(b bool) {
std.mu.Lock()
defer std.mu.Unlock()
std.WriteFields = b
}
// Debug logs a message at level Debug on the standard logger. // Debug logs a message at level Debug on the standard logger.
func Debug(args ...interface{}) { func Debug(args ...interface{}) {
std.Debug(args...) std.Debug(args...)
......
...@@ -26,11 +26,6 @@ type Logger struct { ...@@ -26,11 +26,6 @@ type Logger struct {
// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be // to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
// logged. `logrus.Debug` is useful in // logged. `logrus.Debug` is useful in
Level Level Level Level
// WriteFields permits the logger to add time, msg, level data to
// user-provided Fields
WriteFields bool
// Used to sync writing to the log. // Used to sync writing to the log.
mu sync.Mutex mu sync.Mutex
} }
......
...@@ -17,7 +17,6 @@ func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fi ...@@ -17,7 +17,6 @@ func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fi
logger := New() logger := New()
logger.Out = &buffer logger.Out = &buffer
logger.Formatter = new(JSONFormatter) logger.Formatter = new(JSONFormatter)
logger.WriteFields = true
log(logger) log(logger)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment