Merge pull request #54 from hashicorp/f-mutex-copy

Fix sharing the mutex between created loggers properly

interceptlogger.go

@@ -12,14 +12,15 @@ var _ Logger = &interceptLogger{}
 type interceptLogger struct {
 	Logger
 
-	sync.Mutex
+	mu        *sync.Mutex
 	sinkCount *int32
 	Sinks     map[SinkAdapter]struct{}
 }
 
 func NewInterceptLogger(opts *LoggerOptions) InterceptLogger {
 	intercept := &interceptLogger{
 		Logger:    New(opts),
+		mu:        new(sync.Mutex),
 		sinkCount: new(int32),
 		Sinks:     make(map[SinkAdapter]struct{}),
 	}
@@ -36,8 +37,8 @@ func (i *interceptLogger) Trace(msg string, args ...interface{}) {
 		return
 	}
 
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 	for s := range i.Sinks {
 		s.Accept(i.Name(), Trace, msg, i.retrieveImplied(args...)...)
 	}
@@ -50,8 +51,8 @@ func (i *interceptLogger) Debug(msg string, args ...interface{}) {
 		return
 	}
 
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 	for s := range i.Sinks {
 		s.Accept(i.Name(), Debug, msg, i.retrieveImplied(args...)...)
 	}
@@ -64,8 +65,8 @@ func (i *interceptLogger) Info(msg string, args ...interface{}) {
 		return
 	}
 
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 	for s := range i.Sinks {
 		s.Accept(i.Name(), Info, msg, i.retrieveImplied(args...)...)
 	}
@@ -78,8 +79,8 @@ func (i *interceptLogger) Warn(msg string, args ...interface{}) {
 		return
 	}
 
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 	for s := range i.Sinks {
 		s.Accept(i.Name(), Warn, msg, i.retrieveImplied(args...)...)
 	}
@@ -92,8 +93,8 @@ func (i *interceptLogger) Error(msg string, args ...interface{}) {
 		return
 	}
 
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 	for s := range i.Sinks {
 		s.Accept(i.Name(), Error, msg, i.retrieveImplied(args...)...)
 	}
@@ -178,8 +179,8 @@ func (i *interceptLogger) With(args ...interface{}) Logger {
 
 // RegisterSink attaches a SinkAdapter to interceptLoggers sinks.
 func (i *interceptLogger) RegisterSink(sink SinkAdapter) {
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 
 	i.Sinks[sink] = struct{}{}
 
@@ -188,8 +189,8 @@ func (i *interceptLogger) RegisterSink(sink SinkAdapter) {
 
 // DeregisterSink removes a SinkAdapter from interceptLoggers sinks.
 func (i *interceptLogger) DeregisterSink(sink SinkAdapter) {
-	i.Lock()
-	defer i.Unlock()
+	i.mu.Lock()
+	defer i.mu.Unlock()
 
 	delete(i.Sinks, sink)