diff --git a/cmd/vendor/github.com/sirupsen/logrus/entry.go b/cmd/vendor/github.com/sirupsen/logrus/entry.go index 1fad45e0823..5bf582ef277 100644 --- a/cmd/vendor/github.com/sirupsen/logrus/entry.go +++ b/cmd/vendor/github.com/sirupsen/logrus/entry.go @@ -94,10 +94,7 @@ func (entry Entry) log(level Level, msg string) { entry.Level = level entry.Message = msg - entry.Logger.mu.Lock() - err := entry.Logger.Hooks.Fire(level, &entry) - entry.Logger.mu.Unlock() - if err != nil { + if err := entry.Logger.Hooks.Fire(level, &entry); err != nil { entry.Logger.mu.Lock() fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err) entry.Logger.mu.Unlock() diff --git a/cmd/vendor/github.com/sirupsen/logrus/logger.go b/cmd/vendor/github.com/sirupsen/logrus/logger.go index fdaf8a65341..2acab050989 100644 --- a/cmd/vendor/github.com/sirupsen/logrus/logger.go +++ b/cmd/vendor/github.com/sirupsen/logrus/logger.go @@ -315,9 +315,3 @@ func (logger *Logger) level() Level { func (logger *Logger) SetLevel(level Level) { atomic.StoreUint32((*uint32)(&logger.Level), uint32(level)) } - -func (logger *Logger) AddHook(hook Hook) { - logger.mu.Lock() - defer logger.mu.Unlock() - logger.Hooks.Add(hook) -} diff --git a/glide.lock b/glide.lock index 424d02d5ccb..8c2cb96b0f4 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 8136b7373396e6f72a1f99838d706292c688ccb94bb1bddee7124babde335e31 -updated: 2017-11-17T14:01:41.761462-08:00 +hash: 775ef3aaeb7c16c54b68880b78cc6f4bccd40798f5b923d37bfa50b1b8867ca5 +updated: 2017-11-30T10:02:20.77689-08:00 imports: - name: github.com/beorn7/perks version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 @@ -102,7 +102,7 @@ imports: - name: github.com/russross/blackfriday version: 4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c - name: github.com/sirupsen/logrus - version: 89742aefa4b206dcf400792f3bd35b542998eb3b + version: f006c2ac4710855cf0f916dd6b77acf6b048dc6e - name: github.com/soheilhy/cmux version: bb79a83465015a27a175925ebd155e660f55e9f1 - name: github.com/spf13/cobra diff --git a/glide.yaml b/glide.yaml index 7a1d890154d..1490320b050 100644 --- a/glide.yaml +++ b/glide.yaml @@ -139,6 +139,8 @@ import: - unicode/norm - package: github.com/russross/blackfriday version: 4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c +- package: github.com/sirupsen/logrus + version: v1.0.3 - package: github.com/soheilhy/cmux version: v0.1.3 - package: github.com/tmc/grpc-websocket-proxy