feat: dont print log when running commands unless error (#800)

goravel · Dec 31, 2024 · b202f13 · b202f13
1 parent a8c5084
commit b202f13
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/console/application.go b/console/application.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/goravel/framework/contracts/console"
 	"github.com/goravel/framework/contracts/console/command"
+	"github.com/goravel/framework/support/env"
 )
 
 type Application struct {
@@ -17,19 +18,18 @@ type Application struct {
 
 // NewApplication Create a new Artisan application.
 // The artisan parameter is used by goravel/installer.
-func NewApplication(name, usage, usageText, version string, artisan ...bool) console.Artisan {
+func NewApplication(name, usage, usageText, version string) console.Artisan {
 	instance := cli.NewApp()
 	instance.Name = name
 	instance.Usage = usage
 	instance.UsageText = usageText
 	instance.Version = version
 	instance.CommandNotFound = commandNotFound
 	instance.OnUsageError = onUsageError
-	isArtisan := len(artisan) > 0 && artisan[0]
 
 	return &Application{
 		instance:  instance,
-		isArtisan: isArtisan,
+		isArtisan: env.IsArtisan(),
 	}
 }
 

diff --git a/console/application_test.go b/console/application_test.go
@@ -13,7 +13,7 @@ import (
 var testCommand = 0
 
 func TestRun(t *testing.T) {
-	cliApp := NewApplication("test", "test", "test", "test", true)
+	cliApp := NewApplication("test", "test", "test", "test")
 	cliApp.Register([]console.Command{
 		&TestCommand{},
 	})

diff --git a/console/cli_helper_test.go b/console/cli_helper_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestShowCommandHelp_HelpPrinterCustom(t *testing.T) {
-	cliApp := NewApplication("test", "test", "test", "test", true)
+	cliApp := NewApplication("test", "test", "test", "test")
 	cliApp.Register([]console.Command{
 		&TestFooCommand{},
 		&TestBarCommand{},

diff --git a/console/service_provider.go b/console/service_provider.go
@@ -17,7 +17,7 @@ func (receiver *ServiceProvider) Register(app foundation.Application) {
 		name := "artisan"
 		usage := "Goravel Framework"
 		usageText := "artisan [global options] command [options] [arguments...]"
-		return NewApplication(name, usage, usageText, app.Version(), true), nil
+		return NewApplication(name, usage, usageText, app.Version()), nil
 	})
 }
 

diff --git a/database/gorm/logger.go b/database/gorm/logger.go
@@ -14,13 +14,17 @@ import (
 	"github.com/goravel/framework/contracts/config"
 	"github.com/goravel/framework/contracts/log"
 	"github.com/goravel/framework/errors"
+	"github.com/goravel/framework/support/env"
 )
 
 func NewLogger(config config.Config, log log.Log) logger.Interface {
 	level := logger.Warn
 	if config.GetBool("app.debug") {
 		level = logger.Info
 	}
+	if env.IsArtisan() {
+		level = logger.Error
+	}
 
 	slowThreshold := config.GetInt("database.slow_threshold", 200)
 	if slowThreshold <= 0 {

diff --git a/support/env/env.go b/support/env/env.go
@@ -25,6 +25,16 @@ func IsArm() bool {
 	return runtime.GOARCH == "arm" || runtime.GOARCH == "arm64"
 }
 
+func IsArtisan() bool {
+	for _, arg := range os.Args {
+		if arg == "artisan" {
+			return true
+		}
+	}
+
+	return false
+}
+
 // IsDarwin returns whether the current operating system is Darwin.
 // IsDarwin 返回当前操作系统是否为 Darwin。
 func IsDarwin() bool {