Browse Source

Fix process blocking problem during check (#1911)

anqiansong 3 years ago
parent
commit
5e7b1f6bfe
2 changed files with 4 additions and 4 deletions
  1. 3 3
      tools/goctl/env/check.go
  2. 1 1
      tools/goctl/util/console/console.go

+ 3 - 3
tools/goctl/env/check.go

@@ -83,7 +83,7 @@ command 'goctl env check --install' to install it, for details, please execute c
 				install()
 				install()
 				continue
 				continue
 			}
 			}
-			log.Info("[goctl-env]: do you want to install %q [y: YES, n: No]", e.name)
+			console.Info("[goctl-env]: do you want to install %q [y: YES, n: No]", e.name)
 			for {
 			for {
 				var in string
 				var in string
 				fmt.Scanln(&in)
 				fmt.Scanln(&in)
@@ -94,10 +94,10 @@ command 'goctl env check --install' to install it, for details, please execute c
 					brk = true
 					brk = true
 				case strings.EqualFold(in, "n"):
 				case strings.EqualFold(in, "n"):
 					pending = false
 					pending = false
-					log.Info("[goctl-env]: %q installation is ignored", e.name)
+					console.Info("[goctl-env]: %q installation is ignored", e.name)
 					brk = true
 					brk = true
 				default:
 				default:
-					log.Error("[goctl-env]: invalid input, input 'y' for yes, 'n' for no")
+					console.Error("[goctl-env]: invalid input, input 'y' for yes, 'n' for no")
 				}
 				}
 				if brk {
 				if brk {
 					break
 					break

+ 1 - 1
tools/goctl/util/console/console.go

@@ -175,7 +175,7 @@ func println(msg interface{}) {
 	fmt.Println(msg)
 	fmt.Println(msg)
 }
 }
 
 
-var defaultConsole = new(colorConsole)
+var defaultConsole = &colorConsole{enable: true}
 
 
 func Success(format string, a ...interface{}) {
 func Success(format string, a ...interface{}) {
 	defaultConsole.Success(format, a...)
 	defaultConsole.Success(format, a...)