feat: 添加traceid

2637309949 · Nov 30, 2021 · f72f928 · f72f928
1 parent efe5e65
commit f72f928
Show file tree

Hide file tree

Showing 132 changed files with 1,237 additions and 904 deletions.
diff --git a/cmd/dolphin/generate.go b/cmd/dolphin/generate.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"html/template"
 	"io"
@@ -18,8 +19,8 @@ import (
 	"github.com/2637309949/dolphin/cmd/dolphin/modules"
 	"github.com/2637309949/dolphin/cmd/dolphin/parser"
 	"github.com/2637309949/dolphin/cmd/dolphin/utils"
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/go-errors/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/thoas/go-funk"
 )
 
@@ -122,11 +123,11 @@ func (gen *Gen) Build(cfg *parser.TmplCfg) error {
 	if _, err = os.Stat(genFilePath); !os.IsNotExist(err) {
 		if cfg.Overlap == parser.OverlapInc {
 			genFilePath = genFilePath + ".new"
-			logrus.Info(fmt.Sprintf("%s inc generate", genFilePath))
+			logrus.Info(context.TODO(), fmt.Sprintf("%s inc generate", genFilePath))
 		} else if cfg.Overlap == parser.OverlapWrite {
-			logrus.Warn(fmt.Sprintf("%s over generate", genFilePath))
+			logrus.Warn(context.TODO(), fmt.Sprintf("%s over generate", genFilePath))
 		} else if cfg.Overlap == parser.OverlapSkip {
-			logrus.Info(fmt.Sprintf("%s skip generate", genFilePath))
+			logrus.Info(context.TODO(), fmt.Sprintf("%s skip generate", genFilePath))
 			return nil
 		}
 	}

diff --git a/cmd/dolphin/main.go b/cmd/dolphin/main.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"os"
@@ -18,8 +19,8 @@ import (
 	"github.com/2637309949/dolphin/cmd/dolphin/utils"
 	"github.com/2637309949/dolphin/packages/web"
 
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/shurcooL/vfsgen"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
@@ -107,14 +108,14 @@ func InitViper(cmd *cobra.Command, _ []string) {
 	viper.SetDefault("swag.scope.admin", "Grants read and write access to administrative information")
 	viper.AutomaticEnv()
 	if err := viper.ReadInConfig(); err != nil {
-		logrus.Warn("configuration file not found")
+		logrus.Warn(context.TODO(), "configuration file not found")
 	}
 	utils.ViperSetDefault("oauth.server", strings.TrimSpace(viper.GetString("oauth.server")), fmt.Sprintf("http://localhost:%v", viper.GetString("http.port")))
 	utils.ViperSetDefault("oauth.client", strings.TrimSpace(viper.GetString("oauth.client")), viper.GetString("http.port"))
 	utils.ViperSetDefault("app.host", strings.TrimSpace(viper.GetString("app.host")), fmt.Sprintf("localhost:%v", viper.GetString("http.port")))
 	if viper.GetBool("app.viper") {
 		if err := viper.WriteConfig(); err != nil {
-			logrus.Warn("failed to save configuration file")
+			logrus.Warn(context.TODO(), "failed to save configuration file")
 		}
 	}
 }
@@ -218,7 +219,7 @@ var (
 			if err != nil {
 				return err
 			}
-			logrus.Infof("new project success, cd to %v dir and run `dolphin build`", args[0])
+			logrus.Infof(context.TODO(), "new project success, cd to %v dir and run `dolphin build`", args[0])
 			return nil
 		},
 	}
@@ -264,6 +265,6 @@ func main() {
 	rootCmd.AddCommand(serve)
 	rootCmd.AddCommand(assert)
 	if err := rootCmd.Execute(); err != nil {
-		logrus.Fatal(err)
+		logrus.Fatal(context.TODO(), err)
 	}
 }
diff --git a/cmd/dolphin/modules/more.go b/cmd/dolphin/modules/more.go
@@ -5,6 +5,7 @@
 package modules
 
 import (
+	"context"
 	"html/template"
 	"io/ioutil"
 	"path"
@@ -13,8 +14,8 @@ import (
 	"github.com/2637309949/dolphin/cmd/dolphin/parser"
 	"github.com/2637309949/dolphin/cmd/dolphin/template/dist"
 	"github.com/2637309949/dolphin/cmd/dolphin/utils"
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/shurcooL/httpfs/vfsutil"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/thoas/go-funk"
 )
@@ -51,7 +52,7 @@ func (m *More) Build(dir string, args []string, appParser *parser.AppParser) ([]
 		return []*parser.TmplCfg{}, err
 	}
 	if len(args) < 1 {
-		logrus.Warn("Please give the path to generate the table")
+		logrus.Warn(context.TODO(), "Please give the path to generate the table")
 		return tmplCfgs, nil
 	}
 	ctrPath := utils.SearchFileInDirWithSuffix(dir, ".xml", func(s string) bool {

diff --git a/cmd/dolphin/modules/reverse.go b/cmd/dolphin/modules/reverse.go
@@ -5,6 +5,7 @@
 package modules
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"html/template"
@@ -15,9 +16,9 @@ import (
 	"github.com/2637309949/dolphin/cmd/dolphin/parser"
 	"github.com/2637309949/dolphin/cmd/dolphin/template/dist"
 	"github.com/2637309949/dolphin/cmd/dolphin/utils"
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/2637309949/dolphin/packages/xormplus/xorm"
 	"github.com/shurcooL/httpfs/vfsutil"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 
@@ -86,7 +87,7 @@ func (app *Reverse) Build(dir string, args []string, appParser *parser.AppParser
 			return tmplCfgs, err
 		}
 		for i2 := range tables {
-			logrus.Infoln(tables[i2].Name)
+			logrus.Infoln(context.TODO(), tables[i2].Name)
 			meta := parser.Table{}
 			meta.Name = tables[i2].Name
 			meta.Desc = strings.ReplaceAll(tables[i2].Comment, "\n", "")

diff --git a/cmd/dolphin/template/assets/ctr.tmpl b/cmd/dolphin/template/assets/ctr.tmpl
@@ -10,7 +10,7 @@ import (
 
 	"github.com/gin-gonic/gin/binding"
 	"github.com/thoas/go-funk"
-	"github.com/sirupsen/logrus"
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/2637309949/dolphin/packages/null"
 	"{{.PackageName}}/util/errors"
 	"time"
@@ -62,7 +62,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	db := ctx.MustDB()
 	ret, err := ctr.Srv.DB.PageSearch(db, "{{$.Controller.Name}}", "{{.Name}}", "{{.Table}}", q.Value())
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -87,7 +87,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	db := ctx.MustDB()
 	ret, err := ctr.Srv.DB.TreeSearch(db, "{{$.Controller.Name}}", "{{.Name}}", "{{.Table}}", q.Value())
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -126,7 +126,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	db := ctx.MustDB()
 	ret, err := db.Insert(&payload)
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -135,7 +135,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	{{- $bp := index .Params 0}}
 	var payload {{$bp.Ref $bp.Type}}
 	if err := ctx.ShouldBindWith(&payload); err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -148,7 +148,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 		IsDelete:    null.IntFrom(1),
 	})
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -161,7 +161,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 		IsDelete:    null.IntFrom(1),
 	})
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -176,7 +176,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	var r int64
 	{{- end}}
 	if err := ctx.ShouldBindWith(&payload); err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -192,22 +192,22 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 		payload[i].Updater = null.IntFromStr(ctx.MustToken().GetUserID())
 		r, err = s.ID(payload[i].ID.Int64).Update(&payload[i])
 		if  err != nil {
-			logrus.Error(err)
+			logrus.Error(ctx, err)
 			s.Rollback()
 			ctx.Fail(err)
 			return
 		}
 		ret = append(ret, r)
 	}
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		s.Rollback()
 		ctx.Fail(err)
 		return
 	}
 	err = s.Commit()
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -219,7 +219,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	db := ctx.MustDB()
 	ret, err := db.ID(payload.ID.Int64).Update(&payload)
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -229,13 +229,13 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	var one {{$.Viper.GetString "dir.types" }}.{{.ToUpperCase .Table}}
 	err := ctx.ShouldBindWith(&one)
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
 
 	if ext, err := db.Get(&one); err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	} else if !ext {
@@ -255,7 +255,7 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	db := ctx.MustDB()
 	ret, err := ctr.Srv.TODO(ctx, db, struct{}{})
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
@@ -268,15 +268,15 @@ func (ctr *{{$.Controller.ToUpperCase $.Controller.Name}}) {{$.Controller.ToUppe
 	var payload struct{}
 	{{- end}}
 	if err := ctx.ShouldBindWith(&payload); err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}
 
 	db := ctx.MustDB()
 	ret, err := ctr.Srv.TODO(ctx, db, struct{}{})
 	if err != nil {
-		logrus.Error(err)
+		logrus.Error(ctx, err)
 		ctx.Fail(err)
 		return
 	}

diff --git a/cmd/dolphin/template/assets/srv.tmpl b/cmd/dolphin/template/assets/srv.tmpl
@@ -11,7 +11,7 @@ import (
 	"{{.PackageName}}/{{$.Viper.GetString "dir.svc" }}"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
+	"github.com/2637309949/dolphin/packages/logrus"
 	"github.com/2637309949/dolphin/packages/xormplus/xorm"
 )
 
@@ -48,10 +48,10 @@ func (srv *{{$.Controller.ToUpperCase $.Controller.Name}}) TODO(ctx context.Cont
 	for range ticker.C {
 		select {
 		case {{.lt}}-cwt.Done():
-			logrus.Infoln("child process interrupt...")
+			logrus.Infoln(ctx, "child process interrupt...")
 			return {{.lt}}-chi, cwt.Err()
 		default:
-			logrus.Infoln("awaiting job...")
+			logrus.Infoln(ctx, "awaiting job...")
 		}
 	}
 	return nil, errors.New("no implementation found")