修正采用wg来协同

y-omicron · Jul 29, 2022 · b985a36 · b985a36
1 parent 2a5df1c
commit b985a36
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/Log/log.go b/Log/log.go
@@ -123,8 +123,8 @@ func Warning(cStr string, args ...any) {
 	logContext.wg.Add(1)
 }
 func Info(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
 		fMsg := fmt.Sprintf("%s [ info ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}
@@ -136,8 +136,8 @@ func Info(cStr string, args ...any) {
 	logContext.wg.Add(1)
 }
 func Debug(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
 		fMsg := fmt.Sprintf("%s [ debug ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}
@@ -149,8 +149,8 @@ func Debug(cStr string, args ...any) {
 	logContext.wg.Add(1)
 }
 func Trace(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
 		fMsg := fmt.Sprintf("%s [ trace ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}
@@ -162,8 +162,9 @@ func Trace(cStr string, args ...any) {
 	logContext.wg.Add(1)
 }
 func Error(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
+
 		fMsg := fmt.Sprintf("%s [ error ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}
@@ -172,8 +173,9 @@ func Error(cStr string, args ...any) {
 	logContext.wg.Add(1)
 }
 func Fatal(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
+
 		fMsg := fmt.Sprintf("%s [ fatal ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}
@@ -183,8 +185,9 @@ func Fatal(cStr string, args ...any) {
 	os.Exit(0)
 }
 func Success(cStr string, args ...any) {
-	logContext.wg.Add(1)
 	if logContext.IsFile {
+		logContext.wg.Add(1)
+
 		fMsg := fmt.Sprintf("%s [ fatal ] %s", time.Now().Format(timeFormatLayout), cStr)
 		logContext.fMsg <- fmt.Sprintf(fMsg, args...)
 	}

diff --git a/go.mod b/go.mod
@@ -2,7 +2,10 @@ module github.com/y-omicron/util
 
 go 1.18
 
-require github.com/gookit/color v1.5.1
+require (
+	github.com/alecthomas/kong v0.6.1
+	github.com/gookit/color v1.5.1
+)
 
 require (
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect

diff --git a/go.sum b/go.sum
@@ -1,5 +1,10 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/alecthomas/kong v0.6.1 h1:1kNhcFepkR+HmasQpbiKDLylIL8yh5B5y1zPp5bJimA=
+github.com/alecthomas/kong v0.6.1/go.mod h1:JfHWDzLmbh/puW6I3V7uWenoh56YNVONW+w8eKeUr9I=
+github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48=
+github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gookit/color v1.5.1 h1:Vjg2VEcdHpwq+oY63s/ksHrgJYCTo0bwWvmmYWdE9fQ=
 github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=