diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1b98521378f80759cb6fec2a5a7a0add6b16b46b..5364a8e826e305a4cc366d2ccfb897dbe2faa56d 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -133,8 +133,8 @@ }, { "ImportPath": "github.com/maybebtc/logrus", - "Comment": "v0.6.0-7-g51cc99e", - "Rev": "51cc99e4b07ec5516233a8370c28b5eedd096b6b" + "Comment": "v0.6.0-6-g005463f", + "Rev": "005463f8fb49c4a6f36181e05157e111ec5cf8a3" }, { "ImportPath": "github.com/mitchellh/go-homedir", diff --git a/Godeps/_workspace/src/github.com/maybebtc/logrus/entry.go b/Godeps/_workspace/src/github.com/maybebtc/logrus/entry.go index bb2aabdbcfc27efbd6166fec67816d03726fdc90..e164eecb5f3314bfcd5f2944009f2e4a4b7fbe1c 100644 --- a/Godeps/_workspace/src/github.com/maybebtc/logrus/entry.go +++ b/Godeps/_workspace/src/github.com/maybebtc/logrus/entry.go @@ -71,14 +71,9 @@ func (entry *Entry) WithFields(fields Fields) *Entry { } func (entry *Entry) log(level Level, msg string) { - - entry.Logger.mu.Lock() - if entry.Logger.WriteFields { - entry.Time = time.Now() - entry.Level = level - entry.Message = msg - } - entry.Logger.mu.Unlock() + entry.Time = time.Now() + entry.Level = level + entry.Message = msg if err := entry.Logger.Hooks.Fire(level, entry); err != nil { entry.Logger.mu.Lock() diff --git a/Godeps/_workspace/src/github.com/maybebtc/logrus/entry_test.go b/Godeps/_workspace/src/github.com/maybebtc/logrus/entry_test.go index 8359abe18a406313e8ec25c51e9781927644ffcd..98717df4901bd2157884e3a039b49e97b44aebe8 100644 --- a/Godeps/_workspace/src/github.com/maybebtc/logrus/entry_test.go +++ b/Godeps/_workspace/src/github.com/maybebtc/logrus/entry_test.go @@ -26,7 +26,6 @@ func TestEntryPanicln(t *testing.T) { logger := New() logger.Out = &bytes.Buffer{} - logger.WriteFields = true entry := NewEntry(logger) entry.WithField("err", errBoom).Panicln("kaboom") } @@ -49,7 +48,6 @@ func TestEntryPanicf(t *testing.T) { logger := New() logger.Out = &bytes.Buffer{} - logger.WriteFields = true entry := NewEntry(logger) entry.WithField("err", errBoom).Panicf("kaboom %v", true) } diff --git a/Godeps/_workspace/src/github.com/maybebtc/logrus/exported.go b/Godeps/_workspace/src/github.com/maybebtc/logrus/exported.go index 46fb099aa14a9938e510e52f180ea7372859e5a8..0e2d59f19a724d5199c30ef70eecf4295d72b3d1 100644 --- a/Godeps/_workspace/src/github.com/maybebtc/logrus/exported.go +++ b/Godeps/_workspace/src/github.com/maybebtc/logrus/exported.go @@ -56,14 +56,6 @@ func WithFields(fields Fields) *Entry { 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. func Debug(args ...interface{}) { std.Debug(args...) diff --git a/Godeps/_workspace/src/github.com/maybebtc/logrus/logger.go b/Godeps/_workspace/src/github.com/maybebtc/logrus/logger.go index ceec1a6c55fb70481a8e4308ab18e547a385a3d6..7374fe365d325fb821996d66334841980fbe1995 100644 --- a/Godeps/_workspace/src/github.com/maybebtc/logrus/logger.go +++ b/Godeps/_workspace/src/github.com/maybebtc/logrus/logger.go @@ -26,11 +26,6 @@ type Logger struct { // to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be // logged. `logrus.Debug` is useful in 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. mu sync.Mutex } diff --git a/Godeps/_workspace/src/github.com/maybebtc/logrus/logrus_test.go b/Godeps/_workspace/src/github.com/maybebtc/logrus/logrus_test.go index 3294279519b4b779149e0221dfe84566205b5ef3..15157d172dad2f9dfc7ffaca30601c1de3e421a5 100644 --- a/Godeps/_workspace/src/github.com/maybebtc/logrus/logrus_test.go +++ b/Godeps/_workspace/src/github.com/maybebtc/logrus/logrus_test.go @@ -17,7 +17,6 @@ func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fi logger := New() logger.Out = &buffer logger.Formatter = new(JSONFormatter) - logger.WriteFields = true log(logger)