Merge pull request #38 from mosca1337/fix_race

Setters should not race against Fire()

lfshook.go

@@ -76,6 +76,8 @@ func NewHook(output interface{}, formatter logrus.Formatter) *LfsHook {
 // SetFormatter sets the format that will be used by hook.
 // If using text formatter, this method will disable color output to make the log file more readable.
 func (hook *LfsHook) SetFormatter(formatter logrus.Formatter) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
 	if formatter == nil {
 		formatter = defaultFormatter
 	} else {
@@ -91,19 +93,25 @@ func (hook *LfsHook) SetFormatter(formatter logrus.Formatter) {
 
 // SetDefaultPath sets default path for levels that don't have any defined output path.
 func (hook *LfsHook) SetDefaultPath(defaultPath string) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
 	hook.defaultPath = defaultPath
 	hook.hasDefaultPath = true
 }
 
 // SetDefaultWriter sets default writer for levels that don't have any defined writer.
 func (hook *LfsHook) SetDefaultWriter(defaultWriter io.Writer) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
 	hook.defaultWriter = defaultWriter
 	hook.hasDefaultWriter = true
 }
 
 // Fire writes the log file to defined path or using the defined writer.
 // User who run this function needs write permissions to the file or directory if the file does not yet exist.
 func (hook *LfsHook) Fire(entry *logrus.Entry) error {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
 	if hook.writers != nil || hook.hasDefaultWriter {
 		return hook.ioWrite(entry)
 	} else if hook.paths != nil || hook.hasDefaultPath {
@@ -122,9 +130,6 @@ func (hook *LfsHook) ioWrite(entry *logrus.Entry) error {
 		ok     bool
 	)
 
-	hook.lock.Lock()
-	defer hook.lock.Unlock()
-
 	if writer, ok = hook.writers[entry.Level]; !ok {
 		if hook.hasDefaultWriter {
 			writer = hook.defaultWriter
@@ -154,9 +159,6 @@ func (hook *LfsHook) fileWrite(entry *logrus.Entry) error {
 		ok   bool
 	)
 
-	hook.lock.Lock()
-	defer hook.lock.Unlock()
-
 	if path, ok = hook.paths[entry.Level]; !ok {
 		if hook.hasDefaultPath {
 			path = hook.defaultPath