From 2eb5237ea27699acdc498d8f4b2d809f5d548c8a Mon Sep 17 00:00:00 2001 From: Ian McCracken Date: Thu, 18 Aug 2016 12:49:19 -0500 Subject: [PATCH] Some test fixes --- logger.go | 5 +++-- logri_test.go | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/logger.go b/logger.go index 9a920b7..27c9c96 100644 --- a/logger.go +++ b/logger.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io" - "os" "strings" "sync" @@ -168,6 +167,7 @@ func (l *Logger) GetEffectiveLevel() logrus.Level { // root of the tree for purposes of configuring loggers. func (l *Logger) ApplyConfig(config LogriConfig) error { root := l.GetRoot() + origoutputs, origlocals := root.outputs, root.localOutputs root.outputs = []io.Writer{} root.localOutputs = []io.Writer{} root.resetChildren() @@ -191,7 +191,8 @@ func (l *Logger) ApplyConfig(config LogriConfig) error { } } if len(root.outputs) == 0 && len(root.localOutputs) == 0 { - root.outputs = append(root.outputs, os.Stderr) + root.outputs = origoutputs + root.localOutputs = origlocals } root.propagate() root.applyTmpState() diff --git a/logri_test.go b/logri_test.go index 5b5cdab..0daf594 100644 --- a/logri_test.go +++ b/logri_test.go @@ -1,7 +1,6 @@ package logri_test import ( - "io/ioutil" "reflect" "testing" @@ -27,7 +26,6 @@ var ( func (s *LogriSuite) SetUpTest(c *C) { logger, hook := test.NewNullLogger() s.logger = NewLoggerFromLogrus(logger) - s.logger.SetOutput(ioutil.Discard) s.hook = hook }