refactor(log): transferred log to go-spring/log

Author: lvan100

go.mod

@@ -4,6 +4,7 @@ go 1.24
 
 require (
 	github.com/expr-lang/expr v1.17.2
+	github.com/go-spring/log v0.0.2
 	github.com/lvan100/go-assert v0.0.2
 	github.com/magiconair/properties v1.8.10
 	github.com/pelletier/go-toml v1.9.5

go.sum

@@ -2,6 +2,8 @@ github.com/expr-lang/expr v1.17.2 h1:o0A99O/Px+/DTjEnQiodAgOIK9PPxL8DtXhBRKC+Iso
 github.com/expr-lang/expr v1.17.2/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/go-spring/log v0.0.2 h1:Apt5hjV5kBjm+jxYzYkLBMEBUt9x7xw/7zINljMENFo=
+github.com/go-spring/log v0.0.2/go.mod h1:aKAsCR5Fv4WyFBtNtHNZV4YmitRutJ1Wh9fRI/IiHZM=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

gs/app.go

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 The Go-Spring Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gs
+
+import (
+	"context"
+
+	"github.com/go-spring/log"
+	"github.com/go-spring/spring-core/gs/internal/gs_app"
+)
+
+type AppStarter struct{}
+
+// Run runs the app and waits for an interrupt signal to exit.
+func (s *AppStarter) Run() {
+	s.RunWith(nil)
+}
+
+// initApp initializes the app.
+func (s *AppStarter) initApp() error {
+	printBanner()
+	if err := initLog(); err != nil {
+		return err
+	}
+	if err := B.(*gs_app.BootImpl).Run(); err != nil {
+		return err
+	}
+	B = nil
+	return nil
+}
+
+// RunWith runs the app with a given function and waits for an interrupt signal to exit.
+func (s *AppStarter) RunWith(fn func(ctx context.Context) error) {
+	var err error
+	defer func() {
+		if err != nil {
+			log.Errorf(context.Background(), log.TagApp, "app run failed: %v", err)
+		}
+	}()
+	if err = s.initApp(); err != nil {
+		return
+	}
+	err = gs_app.GS.RunWith(fn)
+}
+
+// RunAsync runs the app asynchronously and returns a function to stop the app.
+func (s *AppStarter) RunAsync() (func(), error) {
+	if err := s.initApp(); err != nil {
+		return nil, err
+	}
+	if err := gs_app.GS.Start(); err != nil {
+		return nil, err
+	}
+	return func() { gs_app.GS.Stop() }, nil
+}

gs/banner.go

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2025 The Go-Spring Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gs
+
+import (
+	"fmt"
+	"strings"
+)
+
+var appBanner = `
+   ____    ___            ____    ____    ____    ___   _   _    ____ 
+  / ___|  / _ \          / ___|  |  _ \  |  _ \  |_ _| | \ | |  / ___|
+ | |  _  | | | |  _____  \___ \  | |_) | | |_) |  | |  |  \| | | |  _ 
+ | |_| | | |_| | |_____|  ___) | |  __/  |  _ <   | |  | |\  | | |_| |
+  \____|  \___/          |____/  |_|     |_| \_\ |___| |_| \_|  \____| 
+`
+
+// Banner sets a custom app banner.
+func Banner(banner string) {
+	appBanner = banner
+}
+
+// printBanner prints the app banner.
+func printBanner() {
+	if len(appBanner) == 0 {
+		return
+	}
+
+	var sb strings.Builder
+	if appBanner[0] != '\n' {
+		sb.WriteString("\n")
+	}
+
+	maxLength := 0
+	for s := range strings.SplitSeq(appBanner, "\n") {
+		sb.WriteString("\x1b[36m")
+		sb.WriteString(s)
+		sb.WriteString("\x1b[0m\n")
+		if len(s) > maxLength {
+			maxLength = len(s)
+		}
+	}
+
+	if appBanner[len(appBanner)-1] != '\n' {
+		sb.WriteString("\n")
+	}
+
+	var padding []byte
+	if n := (maxLength - len(Version)) / 2; n > 0 {
+		padding = make([]byte, n)
+		for i := range padding {
+			padding[i] = ' '
+		}
+	}
+	sb.WriteString(string(padding))
+	sb.WriteString(Version)
+	fmt.Println(sb.String())
+}

gs/gs.go

@@ -18,10 +18,9 @@ package gs
 
 import (
 	"context"
-	"fmt"
 	"reflect"
-	"strings"
 
+	"github.com/go-spring/log"
 	"github.com/go-spring/spring-core/conf"
 	"github.com/go-spring/spring-core/gs/internal/gs"
 	"github.com/go-spring/spring-core/gs/internal/gs_app"
@@ -30,7 +29,6 @@ import (
 	"github.com/go-spring/spring-core/gs/internal/gs_cond"
 	"github.com/go-spring/spring-core/gs/internal/gs_conf"
 	"github.com/go-spring/spring-core/gs/internal/gs_dync"
-	"github.com/go-spring/spring-core/log"
 )
 
 const (
@@ -175,7 +173,7 @@ func BeanSelectorFor[T any](name ...string) BeanSelector {
 // Property sets a system property.
 func Property(key string, val string) {
 	if err := gs_conf.SysConf.Set(key, val); err != nil {
-		log.Errorf(context.Background(), log.TagGS, "failed to set property key=%s, err=%v", key, err)
+		log.Errorf(context.Background(), log.TagApp, "failed to set property key=%s, err=%v", key, err)
 	}
 }
 
@@ -212,48 +210,12 @@ func FuncJob(fn func(ctx context.Context) error) *RegisteredBean {
 	return Object(funcJob(fn)).AsJob().Caller(1)
 }
 
-type AppStarter struct{}
-
 // Web enables or disables the built-in web server.
 func Web(enable bool) *AppStarter {
 	EnableSimpleHttpServer(enable)
 	return &AppStarter{}
 }
 
-// Run runs the app and waits for an interrupt signal to exit.
-func (s *AppStarter) Run() {
-	s.RunWith(nil)
-}
-
-// RunWith runs the app with a given function and waits for an interrupt signal to exit.
-func (s *AppStarter) RunWith(fn func(ctx context.Context) error) {
-	var err error
-	defer func() {
-		if err != nil {
-			log.Errorf(context.Background(), log.TagGS, "app run failed: %v", err)
-		}
-	}()
-	printBanner()
-	if err = B.(*gs_app.BootImpl).Run(); err != nil {
-		return
-	}
-	B = nil
-	err = gs_app.GS.RunWith(fn)
-}
-
-// RunAsync runs the app asynchronously and returns a function to stop the app.
-func (s *AppStarter) RunAsync() (func(), error) {
-	printBanner()
-	if err := B.(*gs_app.BootImpl).Run(); err != nil {
-		return nil, err
-	}
-	B = nil
-	if err := gs_app.GS.Start(); err != nil {
-		return nil, err
-	}
-	return func() { gs_app.GS.Stop() }, nil
-}
-
 // Run runs the app and waits for an interrupt signal to exit.
 func Run() {
 	new(AppStarter).Run()
@@ -321,50 +283,3 @@ func RefreshProperties() error {
 	}
 	return gs_app.GS.C.RefreshProperties(p)
 }
-
-/********************************** banner ***********************************/
-
-var appBanner = `
-   ____    ___            ____    ____    ____    ___   _   _    ____ 
-  / ___|  / _ \          / ___|  |  _ \  |  _ \  |_ _| | \ | |  / ___|
- | |  _  | | | |  _____  \___ \  | |_) | | |_) |  | |  |  \| | | |  _ 
- | |_| | | |_| | |_____|  ___) | |  __/  |  _ <   | |  | |\  | | |_| |
-  \____|  \___/          |____/  |_|     |_| \_\ |___| |_| \_|  \____| 
-`
-
-// Banner sets a custom app banner.
-func Banner(banner string) {
-	appBanner = banner
-}
-
-// printBanner prints the app banner.
-func printBanner() {
-	if len(appBanner) == 0 {
-		return
-	}
-
-	if appBanner[0] != '\n' {
-		fmt.Println()
-	}
-
-	maxLength := 0
-	for s := range strings.SplitSeq(appBanner, "\n") {
-		fmt.Printf("\x1b[36m%s\x1b[0m\n", s) // CYAN
-		if len(s) > maxLength {
-			maxLength = len(s)
-		}
-	}
-
-	if appBanner[len(appBanner)-1] != '\n' {
-		fmt.Println()
-	}
-
-	var padding []byte
-	if n := (maxLength - len(Version)) / 2; n > 0 {
-		padding = make([]byte, n)
-		for i := range padding {
-			padding[i] = ' '
-		}
-	}
-	fmt.Println(string(padding) + Version + "\n")
-}

gs/internal/gs_app/app.go

@@ -27,11 +27,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/go-spring/log"
 	"github.com/go-spring/spring-core/conf"
 	"github.com/go-spring/spring-core/gs/internal/gs"
 	"github.com/go-spring/spring-core/gs/internal/gs_conf"
 	"github.com/go-spring/spring-core/gs/internal/gs_core"
-	"github.com/go-spring/spring-core/log"
 	"github.com/go-spring/spring-core/util/goutil"
 )
 
@@ -97,7 +97,7 @@ func (app *App) RunWith(fn func(ctx context.Context) error) error {
 		ch := make(chan os.Signal, 1)
 		signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 		sig := <-ch
-		log.Infof(context.Background(), log.TagGS, "Received signal: %v", sig)
+		log.Infof(context.Background(), log.TagApp, "Received signal: %v", sig)
 		app.ShutDown()
 	}()
 
@@ -145,7 +145,7 @@ func (app *App) Start() error {
 					}
 				}()
 				if err := job.Run(app.ctx); err != nil {
-					log.Errorf(context.Background(), log.TagGS, "job run error: %v", err)
+					log.Errorf(context.Background(), log.TagApp, "job run error: %v", err)
 					app.ShutDown()
 				}
 			})
@@ -169,7 +169,7 @@ func (app *App) Start() error {
 				}()
 				err := svr.ListenAndServe(sig)
 				if err != nil && !errors.Is(err, http.ErrServerClosed) {
-					log.Errorf(context.Background(), log.TagGS, "server serve error: %v", err)
+					log.Errorf(context.Background(), log.TagApp, "server serve error: %v", err)
 					sig.Intercept()
 					app.ShutDown()
 				}
@@ -179,7 +179,7 @@ func (app *App) Start() error {
 		if sig.Intercepted() {
 			return nil
 		}
-		log.Infof(context.Background(), log.TagGS, "ready to serve requests")
+		log.Infof(context.Background(), log.TagApp, "ready to serve requests")
 		sig.Close()
 	}
 	return nil
@@ -196,7 +196,7 @@ func (app *App) Stop() {
 		for _, svr := range app.Servers {
 			goutil.GoFunc(func() {
 				if err := svr.Shutdown(ctx); err != nil {
-					log.Errorf(context.Background(), log.TagGS, "shutdown server failed: %v", err)
+					log.Errorf(context.Background(), log.TagApp, "shutdown server failed: %v", err)
 				}
 			})
 		}
@@ -207,9 +207,9 @@ func (app *App) Stop() {
 
 	select {
 	case <-waitChan:
-		log.Infof(context.Background(), log.TagGS, "shutdown complete")
+		log.Infof(context.Background(), log.TagApp, "shutdown complete")
 	case <-ctx.Done():
-		log.Infof(context.Background(), log.TagGS, "shutdown timeout")
+		log.Infof(context.Background(), log.TagApp, "shutdown timeout")
 	}
 }
 

gs/internal/gs_app/app_test.go

@@ -26,10 +26,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-spring/log"
 	"github.com/go-spring/spring-core/conf"
 	"github.com/go-spring/spring-core/gs/internal/gs"
 	"github.com/go-spring/spring-core/gs/internal/gs_conf"
-	"github.com/go-spring/spring-core/log"
 	"github.com/go-spring/spring-core/util/goutil"
 	"github.com/lvan100/go-assert"
 	"go.uber.org/mock/gomock"
@@ -39,7 +39,7 @@ var logBuf = &bytes.Buffer{}
 
 func init() {
 	goutil.OnPanic = func(ctx context.Context, r any) {
-		log.Panicf(ctx, log.TagGS, "panic: %v\n%s\n", r, debug.Stack())
+		log.Panicf(ctx, log.TagDef, "panic: %v\n%s\n", r, debug.Stack())
 	}
 }