From e247f30f45db59052fea73696d3d0c186b6cac10 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanchen@kumoly.io>
Date: Tue, 2 Nov 2021 15:26:10 +0800
Subject: [PATCH] fix: #2, #3

---
 log.go      | 18 +++++++++++++++++-
 log_test.go | 16 ++++++++++++++++
 std.go      |  4 ++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/log.go b/log.go
index 8a05c39..5d307b4 100644
--- a/log.go
+++ b/log.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"sync"
 	"text/template"
 	"time"
 
@@ -26,6 +27,8 @@ const (
 	twarn
 )
 
+var lock sync.Mutex
+
 var PROD = true
 var LEVEL = Lerror | Linfo
 
@@ -77,6 +80,8 @@ type Logger struct {
 	system string
 	color  bool
 
+	explicit bool
+
 	err io.Writer
 	out io.Writer
 
@@ -133,9 +138,16 @@ func (l *Logger) guessColor() {
 	}
 }
 func (l *Logger) SetColor(c bool) {
+	l.explicit = true
 	l.color = c
 }
 
+func (l *Logger) SetColorAll(c bool) {
+	for _, v := range getAllOffsprings(l) {
+		v.SetColor(c)
+	}
+}
+
 func (l *Logger) SetErrOutput(err io.Writer) {
 	l.err = err
 }
@@ -157,7 +169,9 @@ func (l *Logger) SetOutputAll(out io.Writer) {
 }
 
 func (l *Logger) Reload() error {
-	l.guessColor()
+	if !l.explicit {
+		l.guessColor()
+	}
 	return l.ParseTmpl()
 }
 
@@ -233,6 +247,8 @@ func (l *Logger) output(t tout, depth int, stack string, fields H, v ...interfac
 		Color:   l.color,
 		Stack:   stack,
 	}
+	lock.Lock()
+	defer lock.Unlock()
 	var err error
 	switch t {
 	case terror:
diff --git a/log_test.go b/log_test.go
index 03c12a6..ac4f392 100644
--- a/log_test.go
+++ b/log_test.go
@@ -98,6 +98,17 @@ func TestToFile(t *testing.T) {
 	l.WarnF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
 	l.Info("d", "sdf", "sdfsdf")
 	l.InfoF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
+
+	l.SetColor(true)
+	l.Reload()
+	l.Error("d", "sdf", "sdfsdf")
+	l.ErrorF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
+	l.Debug("d", "sdf", "sdfsdf")
+	l.DebugF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
+	l.Warn("d", "sdf", "sdfsdf")
+	l.WarnF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
+	l.Info("d", "sdf", "sdfsdf")
+	l.InfoF(H{"Test": "set"}, "d", "sdf", "sdfsdf")
 }
 
 func TestApplyChild(t *testing.T) {
@@ -119,4 +130,9 @@ func TestApplyChild(t *testing.T) {
 	l1.Info("child1-stdout")
 	l2.Info("child2-stdout")
 	l3.Info("child3-stdout")
+	SetColorAll(false)
+	ReloadAll()
+	l1.Info("child1-nocolor")
+	l2.Info("child2-nocolor")
+	l3.Info("child3-nocolor")
 }
diff --git a/std.go b/std.go
index 15568a1..c8335bf 100644
--- a/std.go
+++ b/std.go
@@ -12,6 +12,10 @@ func SetColor(c bool) {
 	std.SetColor(c)
 }
 
+func SetColorAll(c bool) {
+	std.SetColorAll(c)
+}
+
 func SetErrOutput(err io.Writer) {
 	std.SetErrOutput(err)
 }